diff --git a/.gitignore b/.gitignore
index 26728c7c..acda0895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,11 @@
 .cache
 dist
 
+# Regenerated on every `nuxt prepare` by whichever app extends this layer
+# (see nuxt.config.ts in Vease/Vease-Modeling for why it must be self-contained);
+# its content depends on the consumer that generated it, so it can't be committed.
+/tsconfig.json
+
 # Node dependencies
 node_modules
 
@@ -36,7 +41,6 @@ pnpm-lock.yaml
 VTK.txt
 *.nuxtrc
 
-# Compiled Node-safe siblings of server/utils/ and shared/ (see scripts/build_node_utils.ts)
-/server/**/*.js
-/shared/**/*.js
+# Compiled Node-safe build of server/utils/ and shared/ (see rolldown.config.ts)
+/.build
 /opengeodeweb_front_schemas.js
\ No newline at end of file
diff --git a/app/components/ActionButton.vue b/app/components/ActionButton.vue
index afba77a9..5ca60b5a 100644
--- a/app/components/ActionButton.vue
+++ b/app/components/ActionButton.vue
@@ -6,10 +6,8 @@ interface Props {
   tooltip: string;
   color?: string;
   size?: string | number;
-  // Vuetify's variant/density accept narrow literal unions; kept loose here since
-  // Callers pass plain strings and this is only a typing widening, not a behavior change.
-  variant?: any;
-  density?: any;
+  variant?: unknown;
+  density?: unknown;
   tooltipLocation?: string;
   iconSize?: string | number;
 }
@@ -25,9 +23,11 @@ const {
   iconSize = DEFAULT_ICON_SIZE,
 } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   click: [event: MouseEvent];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/CameraManager.vue b/app/components/CameraManager.vue
index 59c8b928..bd37cd14 100644
--- a/app/components/CameraManager.vue
+++ b/app/components/CameraManager.vue
@@ -5,9 +5,11 @@ import ToolPanel from "@ogw_front/components/ToolPanel.vue";
 
 const DEFAULT_PANEL_WIDTH = 260;
 
-const emit = defineEmits<{
+interface Emits {
   close: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   showDialog: boolean;
@@ -21,7 +23,7 @@ const {
   escapeFunction = undefined,
 } = defineProps<Props>();
 
-function handleClose() {
+function handleClose(): void {
   if (escapeFunction) {
     escapeFunction();
   } else {
@@ -29,7 +31,7 @@ function handleClose() {
   }
 }
 
-const show = computed({
+const show = computed<boolean>({
   get: () => showDialog,
   set: (val) => {
     if (!val) {
diff --git a/app/components/CameraManager/List.vue b/app/components/CameraManager/List.vue
index 25896cb8..4f830f95 100644
--- a/app/components/CameraManager/List.vue
+++ b/app/components/CameraManager/List.vue
@@ -8,9 +8,9 @@ const hybridViewerStore = useHybridViewerStore();
 const savedPositions = cameraManagerStore.refAllCameraPositions();
 
 const editingId = ref<number | undefined>(undefined);
-const editingName = ref("");
+const editingName = ref<string>("");
 
-async function restorePosition(positionId: number) {
+async function restorePosition(positionId: number): void {
   const position = await cameraManagerStore.getCameraPosition(positionId);
   if (position) {
     if (hybridViewerStore.genericRenderWindow) {
@@ -21,16 +21,16 @@ async function restorePosition(positionId: number) {
   }
 }
 
-async function deletePosition(positionId: number) {
+async function deletePosition(positionId: number): void {
   await cameraManagerStore.deleteCameraPosition(positionId);
 }
 
-function startEditing(position: { id?: number; name?: string }) {
+function startEditing(position: { id?: number; name?: string }): void {
   editingId.value = position.id;
   editingName.value = position.name ?? "";
 }
 
-async function saveRename() {
+async function saveRename(): void {
   if (editingName.value && editingId.value !== undefined) {
     await cameraManagerStore.renameCameraPosition(editingId.value, editingName.value);
   }
diff --git a/app/components/CameraManager/Saver.vue b/app/components/CameraManager/Saver.vue
index 66f85772..8efd623c 100644
--- a/app/components/CameraManager/Saver.vue
+++ b/app/components/CameraManager/Saver.vue
@@ -1,16 +1,14 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
 import { useCameraManagerStore } from "@ogw_front/stores/camera_manager";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
 
 const cameraManagerStore = useCameraManagerStore();
 const hybridViewerStore = useHybridViewerStore();
 
-const newPositionName = ref("");
+const newPositionName = ref<string>("");
 
-async function saveCurrentPosition() {
+async function saveCurrentPosition(): void {
   if (!newPositionName.value) {
     return;
   }
diff --git a/app/components/CameraOrientation.vue b/app/components/CameraOrientation.vue
index 95f68be9..6da6f70f 100644
--- a/app/components/CameraOrientation.vue
+++ b/app/components/CameraOrientation.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
 import ToolPanel from "@ogw_front/components/ToolPanel.vue";
 import { applyCameraOptions } from "@ogw_internal/stores/hybrid_viewer/camera";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
 import { newInstance as vtkAnnotatedCubeActor } from "@kitware/vtk.js/Rendering/Core/AnnotatedCubeActor";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
 
@@ -22,10 +20,13 @@ const {
   escapeFunction = undefined,
 } = defineProps<Props>();
 
-const show = defineModel<boolean>("show", { default: false });
-const emit = defineEmits<{
+interface Emits {
   select: [value: string];
-}>();
+}
+
+const emit = defineEmits<Emits>();
+
+const show = defineModel<boolean>("show", { default: false });
 
 const orientations = [
   {
@@ -82,12 +83,11 @@ const hoveredFace = ref<string | undefined>(undefined);
 const hybridViewerStore = useHybridViewerStore();
 const cubeContainer = useTemplateRef("cubeContainer");
 
-// VTK.js objects have no usable type declarations here; `any` is the pragmatic choice.
-let genericRenderWindow: any = undefined;
-let cubeActor: any = undefined;
+let genericRenderWindow: unknown = undefined;
+let cubeActor: unknown = undefined;
 let isInteracting = false;
 
-function initVTK() {
+function initVTK(): void {
   if (genericRenderWindow) {
     return;
   }
@@ -132,7 +132,7 @@ function initVTK() {
   renderer.resetCamera();
 }
 
-function syncCubeCamera() {
+function syncCubeCamera(): void {
   const options = hybridViewerStore.camera_options;
   if (!genericRenderWindow || isInteracting || !options.position) {
     return;
@@ -165,7 +165,7 @@ watch(hoveredFace, (newFace, oldFace) => {
   if (!cubeActor) {
     return;
   }
-  function updateFace(face: string | undefined, active: boolean) {
+  function updateFace(face: string | undefined, active: boolean): void {
     const config = orientations.find((orientation) => orientation.face === face);
     if (config) {
       cubeActor[`set${config.vtkKey}FaceProperty`]({
diff --git a/app/components/ClippingPlaneCard.vue b/app/components/ClippingPlaneCard.vue
index a4b66ede..fe55f02a 100644
--- a/app/components/ClippingPlaneCard.vue
+++ b/app/components/ClippingPlaneCard.vue
@@ -8,10 +8,12 @@ interface Props {
 
 const { plane, index } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   remove: [];
   flipNormal: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/ClippingPlanes.vue b/app/components/ClippingPlanes.vue
index 90d79fc7..524b478b 100644
--- a/app/components/ClippingPlanes.vue
+++ b/app/components/ClippingPlanes.vue
@@ -16,13 +16,13 @@ const { escapeFunction = undefined } = defineProps<Props>();
 const show = defineModel<boolean>("show", { default: false });
 const dataStore = useDataStore();
 const hybridViewerStore = useHybridViewerStore();
-const targetAllVisible = ref(true);
+const targetAllVisible = ref<boolean>(true);
 const selectedDatasetIds = ref<string[]>([]);
 const planes = ref<{ origin?: number[]; normal: number[] }[]>([
   { origin: undefined, normal: [1, 0, 0] },
 ]);
 const allItems = dataStore.refAllItems();
-const availableDatasets = computed(() =>
+const availableDatasets = computed<{ title: string; value: string }[]>(() =>
   allItems.value.map((item) => ({
     title: item.name || item.id,
     value: item.id,
@@ -49,7 +49,7 @@ const {
   debouncedApply: (...args: unknown[]) => debouncedApply?.(...args),
 });
 
-async function applyClippingPlanes() {
+async function applyClippingPlanes(): Promise<void> {
   const allIds = allItems.value.map((item) => item.id);
   if (allIds.length === 0) {
     return;
@@ -72,7 +72,7 @@ async function applyClippingPlanes() {
 
 debouncedApply = useDebounceFn(() => applyClippingPlanes(), DEBOUNCE_DELAY);
 
-function addPlane() {
+function addPlane(): void {
   // Index is always in-bounds (modulo the fixed-size list); the fallbacks only
   // Satisfy noUncheckedIndexedAccess and are never hit at runtime.
   const normal = DEFAULT_NORMALS[planes.value.length % DEFAULT_NORMALS.length] ??
@@ -80,17 +80,17 @@ function addPlane() {
   planes.value.push({ origin: getSceneCenter(), normal });
 }
 
-function removePlane(index: number) {
+function removePlane(index: number): void {
   planes.value.splice(index, 1);
 }
 
-function flipNormal(plane: { normal: number[] }) {
+function flipNormal(plane: { normal: number[] }): void {
   plane.normal = plane.normal.map((component) => -component);
   syncWidgets();
   applyClippingPlanes();
 }
 
-async function resetClippingPlanes() {
+async function resetClippingPlanes(): Promise<void> {
   setFromWidget(true);
   planes.value = [{ origin: undefined, normal: [1, 0, 0] }];
   updateWidgetPlacement({ isReset: true });
@@ -98,7 +98,7 @@ async function resetClippingPlanes() {
   await applyClippingPlanes();
 }
 
-async function removeClippingPlanes() {
+async function removeClippingPlanes(): Promise<void> {
   const allIds = allItems.value.map((item) => item.id);
   await hybridViewerStore.setClippingPlanes(allIds, []);
 }
diff --git a/app/components/CrsSelector.vue b/app/components/CrsSelector.vue
index ff1010b6..b6609665 100644
--- a/app/components/CrsSelector.vue
+++ b/app/components/CrsSelector.vue
@@ -4,11 +4,13 @@ import { useBackStore } from "@ogw_front/stores/back";
 
 const schema = schemas.opengeodeweb_back.geographic_coordinate_systems;
 
-const emit = defineEmits<{
+interface Emits {
   update_values: [values: Record<string, unknown>];
   increment_step: [];
   decrement_step: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   geodeObjectType: string;
@@ -17,18 +19,15 @@ interface Props {
 
 const { geodeObjectType, keyToUpdate } = defineProps<Props>();
 
-const search = ref("");
-const data_table_loading = ref(false);
+const search = ref<string>("");
+const data_table_loading = ref<boolean>(false);
 const crs_list = ref<Record<string, unknown>[]>([]);
 const selected_crs = ref<unknown[]>([]);
 const toggle_loading = useToggle(data_table_loading);
 const backStore = useBackStore();
 
-function get_selected_crs(crs_code: unknown) {
-  // Pre-existing off-by-one fixed: `i <= length` read one past the end of
-  // Crs_list, which would have thrown on `undefined["code"]` at runtime.
-  for (let i = 0; i < crs_list.value.length; i += 1) {
-    const crs = crs_list.value[i];
+function get_selected_crs(crs_code: unknown): unknown {
+  for (const crs of crs_list.value) {
     if (crs && crs["code"] === crs_code) {
       return crs;
     }
@@ -44,7 +43,7 @@ watch(selected_crs, (new_value) => {
   emit("increment_step");
 });
 
-async function get_crs_table() {
+async function get_crs_table(): void {
   const params = { geode_object_type: geodeObjectType };
   toggle_loading();
   await backStore.request(
diff --git a/app/components/DeleteDialog.vue b/app/components/DeleteDialog.vue
index 67593ba6..32b2e271 100644
--- a/app/components/DeleteDialog.vue
+++ b/app/components/DeleteDialog.vue
@@ -13,10 +13,12 @@ interface Props {
 
 const { show = false, item = undefined, selectedCount = 0 } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   "update:show": [value: boolean];
   confirm: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/DragAndDrop.vue b/app/components/DragAndDrop.vue
index 1689a235..c8969e06 100644
--- a/app/components/DragAndDrop.vue
+++ b/app/components/DragAndDrop.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { onMounted, onUnmounted, ref } from "vue";
 import DragAndDropInline from "./DragAndDropInternal/DragAndDropInline.vue";
 import DragAndDropOverlay from "./DragAndDropInternal/DragAndDropOverlay.vue";
@@ -48,7 +46,7 @@ const fileInput = ref<HTMLInputElement | undefined>(undefined);
 
 const WILDCARD_SUFFIX_LENGTH = 2;
 
-function isFileAccepted(file: File, acceptValue: string | string[] | undefined) {
+function isFileAccepted(file: File, acceptValue: string | string[] | undefined): boolean {
   const fileName = (file.name || "").toLowerCase();
   const fileType = (file.type || "").toLowerCase();
   const isVext = fileName.endsWith(".vext");
@@ -92,18 +90,18 @@ function isFileAccepted(file: File, acceptValue: string | string[] | undefined)
   });
 }
 
-function triggerFileDialog() {
+function triggerFileDialog(): void {
   fileInput.value?.click();
 }
 
-function onDragEnter(event: DragEvent) {
+function onDragEnter(event: DragEvent): void {
   if (!isInternalDrag.value && event.dataTransfer?.types.includes("Files")) {
     dragCounter.value += 1;
     isDragging.value = true;
   }
 }
 
-function onDragLeave() {
+function onDragLeave(): void {
   dragCounter.value -= 1;
   if (dragCounter.value <= 0) {
     isDragging.value = false;
@@ -111,13 +109,13 @@ function onDragLeave() {
   }
 }
 
-function onDragOver(event: DragEvent) {
+function onDragOver(event: DragEvent): void {
   if (!isInternalDrag.value && event.dataTransfer?.types.includes("Files")) {
     event.preventDefault();
   }
 }
 
-function onDrop(event: DragEvent) {
+function onDrop(event: DragEvent): void {
   event.preventDefault();
   dragCounter.value = 0;
   isDragging.value = false;
@@ -129,7 +127,7 @@ function onDrop(event: DragEvent) {
   }
 }
 
-function onKeyDown(event: KeyboardEvent) {
+function onKeyDown(event: KeyboardEvent): void {
   if (event.key === "Escape") {
     event.preventDefault();
     event.stopPropagation();
@@ -138,7 +136,7 @@ function onKeyDown(event: KeyboardEvent) {
   }
 }
 
-function handleFileSelect(event: Event) {
+function handleFileSelect(event: Event): void {
   const target = event.target as HTMLInputElement;
   const files = [...(target.files ?? [])];
   if (files.length > 0) {
@@ -147,11 +145,11 @@ function handleFileSelect(event: Event) {
   target.value = "";
 }
 
-function onInternalDragStart() {
+function onInternalDragStart(): void {
   isInternalDrag.value = true;
 }
 
-function onInternalDragEnd() {
+function onInternalDragEnd(): void {
   isInternalDrag.value = false;
 }
 
diff --git a/app/components/DragAndDropInternal/DragAndDropInline.vue b/app/components/DragAndDropInternal/DragAndDropInline.vue
index d1944adb..8925ca39 100644
--- a/app/components/DragAndDropInternal/DragAndDropInline.vue
+++ b/app/components/DragAndDropInternal/DragAndDropInline.vue
@@ -27,9 +27,11 @@ const {
   showExtensions,
 } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   click: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/ExtensionSelector.vue b/app/components/ExtensionSelector.vue
index 2e9bb3f3..861f8061 100644
--- a/app/components/ExtensionSelector.vue
+++ b/app/components/ExtensionSelector.vue
@@ -20,11 +20,11 @@ const { geodeObjectType, filenames } = defineProps<Props>();
 type OutputExtensions = Record<string, { is_saveable: boolean }>;
 
 const geode_objects_and_output_extensions = ref<Record<string, OutputExtensions>>({});
-const loading = ref(false);
+const loading = ref<boolean>(false);
 
 const toggle_loading = useToggle(loading);
 
-async function get_output_file_extensions() {
+async function get_output_file_extensions(): Promise<void> {
   toggle_loading();
   geode_objects_and_output_extensions.value = {};
   const backStore = useBackStore();
@@ -51,7 +51,7 @@ async function get_output_file_extensions() {
       }
       for (const extension of Object.keys(extensions)) {
         final_object[key][extension] = {
-          is_saveable: extensions[extension]!.is_saveable,
+          is_saveable: extensions[extension].is_saveable,
         };
       }
     }
@@ -60,7 +60,7 @@ async function get_output_file_extensions() {
   toggle_loading();
 }
 
-function update_values(output_geode_object: string, output_extension: string) {
+function update_values(output_geode_object: string, output_extension: string): void {
   if (output_geode_object !== "" && output_extension !== "") {
     emit("update_values", {
       output_geode_object,
diff --git a/app/components/FeedBack/ErrorBanner.vue b/app/components/FeedBack/ErrorBanner.vue
index 8c7a1948..10aadb0e 100644
--- a/app/components/FeedBack/ErrorBanner.vue
+++ b/app/components/FeedBack/ErrorBanner.vue
@@ -3,9 +3,11 @@ import { useFeedbackStore } from "@ogw_front/stores/feedback";
 
 const feedbackStore = useFeedbackStore();
 
-function reload() {
+function reload(): void {
   globalThis.location.reload();
 }
+
+defineExpose({ reload });
 </script>
 
 <template>
diff --git a/app/components/FeedBack/Snackers.vue b/app/components/FeedBack/Snackers.vue
index ce4455ed..470d4e43 100644
--- a/app/components/FeedBack/Snackers.vue
+++ b/app/components/FeedBack/Snackers.vue
@@ -5,9 +5,9 @@ const MARGIN_BETWEEN_SNACKERS = 60;
 const FIRST_SNACKER_MARGIN = 8;
 
 const feedbackStore = useFeedbackStore();
-const show = ref(true);
+const show = ref<boolean>(true);
 
-function calc_margin(index: number) {
+function calc_margin(index: number): string {
   return `${index * MARGIN_BETWEEN_SNACKERS + FIRST_SNACKER_MARGIN}px`;
 }
 </script>
diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index 2e4927b0..f428e1a8 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -7,11 +7,13 @@ import { useBackStore } from "@ogw_front/stores/back";
 
 const schema = schemas.opengeodeweb_back.allowed_files;
 
-const emit = defineEmits<{
+interface Emits {
   update_values: [values: { files: unknown[]; autoUpload: boolean }];
   increment_step: [];
   decrement_step: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   multiple: boolean;
@@ -22,10 +24,10 @@ interface Props {
 
 const { multiple, files = [], autoUpload = true, showOverlay = true } = defineProps<Props>();
 
-const internal_files = ref(files);
-const internal_auto_upload = ref(autoUpload);
-const accept = ref("");
-const loading = ref(false);
+const internal_files = ref<File[]>(files);
+const internal_auto_upload = ref<boolean>(autoUpload);
+const accept = ref<string>("");
+const loading = ref<boolean>(false);
 
 watch(
   () => files,
@@ -43,14 +45,14 @@ watch(
 
 const toggle_loading = useToggle(loading);
 
-function files_uploaded_event(value: unknown[]) {
+function files_uploaded_event(value: unknown[]): void {
   if (value.length > 0) {
     emit("update_values", { files: value, autoUpload: false });
     emit("increment_step");
   }
 }
 
-async function get_allowed_files() {
+async function get_allowed_files(): Promise<void> {
   toggle_loading();
   const backStore = useBackStore();
   const response = (await backStore.request({ schema })) as {
diff --git a/app/components/FileUploader.vue b/app/components/FileUploader.vue
index 9b2f81ae..111382f0 100644
--- a/app/components/FileUploader.vue
+++ b/app/components/FileUploader.vue
@@ -32,26 +32,26 @@ const {
 } = defineProps<Props>();
 
 const backStore = useBackStore();
-const internal_files = ref(files);
+const internal_files = ref<UploadFile[]>(files);
 const dragAndDropRef = useTemplateRef("dragAndDropRef");
-const csv_dialog = ref(false);
+const csv_dialog = ref<boolean>(false);
 const current_csv_file = ref<UploadFile | undefined>(undefined);
-const current_csv_index = ref(-1);
-const loading = ref(false);
-const files_uploaded = ref(false);
+const current_csv_index = ref<number>(-1);
+const loading = ref<boolean>(false);
+const files_uploaded = ref<boolean>(false);
 const toggle_loading = useToggle(loading);
 
-function isCsv(file: UploadFile) {
+function isCsv(file: UploadFile): boolean {
   return file.name.toLowerCase().endsWith(".csv");
 }
 
-function openCsvPreviewer(file: UploadFile, index: number) {
+function openCsvPreviewer(file: UploadFile, index: number): void {
   current_csv_file.value = file;
   current_csv_index.value = index;
   csv_dialog.value = true;
 }
 
-async function onCsvConfirm(result: unknown) {
+async function onCsvConfirm(result: unknown): Promise<void> {
   // Only reachable while the CsvPreviewer dialog (gated on current_csv_file) is open.
   const currentFile = current_csv_file.value;
   if (!currentFile) {
@@ -72,7 +72,7 @@ async function onCsvConfirm(result: unknown) {
   csv_dialog.value = false;
 }
 
-function processSelectedFiles(selected_files: UploadFile[]) {
+function processSelectedFiles(selected_files: UploadFile[]): void {
   if (multiple) {
     internal_files.value = [...internal_files.value, ...selected_files];
   } else {
@@ -83,7 +83,7 @@ function processSelectedFiles(selected_files: UploadFile[]) {
   }
 }
 
-function removeFile(index: number) {
+function removeFile(index: number): void {
   internal_files.value.splice(index, 1);
   if (internal_files.value.length === 0) {
     files_uploaded.value = false;
@@ -91,7 +91,7 @@ function removeFile(index: number) {
   }
 }
 
-async function upload_files() {
+async function upload_files(): Promise<void> {
   toggle_loading();
   const promise_array = internal_files.value.map((file) => backStore.upload(file));
   await Promise.all(promise_array);
diff --git a/app/components/GlassCard.vue b/app/components/GlassCard.vue
index dc3b4861..65a4eb9f 100644
--- a/app/components/GlassCard.vue
+++ b/app/components/GlassCard.vue
@@ -19,7 +19,7 @@ const {
 } = defineProps<Props>();
 
 const attrs = useAttrs();
-const isInteractive = computed(() => Boolean(attrs.onClick));
+const isInteractive = computed<boolean>(() => Boolean(attrs.onClick));
 
 onKeyStroke("Escape", () => {
   if (escapeFunction) {
diff --git a/app/components/HybridRenderingView.vue b/app/components/HybridRenderingView.vue
index b78994c8..9af2eb75 100644
--- a/app/components/HybridRenderingView.vue
+++ b/app/components/HybridRenderingView.vue
@@ -11,9 +11,11 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 
 const DEFAULT_ELEMENT_HEIGHT = 100;
 
-const emit = defineEmits<{
+interface Emits {
   click: [event: PointerEvent];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const container = useTemplateRef("viewer");
 const hybridViewerStore = useHybridViewerStore();
@@ -26,8 +28,8 @@ const { width: windowWidth, height: windowHeight } = useWindowSize();
 
 function debounce<Callback extends (...args: unknown[]) => void>(func: Callback, wait: number) {
   let timeout: ReturnType<typeof setTimeout> | undefined = undefined;
-  return function executedFunction(...args: Parameters<Callback>) {
-    function later() {
+  return function executedFunction(...args: Parameters<Callback>): void {
+    function later(): void {
       clearTimeout(timeout);
       func(...args);
     }
@@ -58,7 +60,7 @@ onMounted(async () => {
 
 const { pickColormap, quickColormap } = useQuickColormap();
 
-async function handleClick(event: PointerEvent) {
+async function handleClick(event: PointerEvent): Promise<void> {
   const { offsetX, offsetY, clientX, clientY } = event;
   // Only ever fired from the pointerup handler bound to this same element.
   const containerEl = container.value;
diff --git a/app/components/HybridViewerTooltip.vue b/app/components/HybridViewerTooltip.vue
index 795139cd..bb65a04e 100644
--- a/app/components/HybridViewerTooltip.vue
+++ b/app/components/HybridViewerTooltip.vue
@@ -16,7 +16,7 @@ const hybridViewerStore = useHybridViewerStore();
 const tooltipRef = useTemplateRef("tooltip");
 const { width: tooltipWidth, height: tooltipHeight } = useElementSize(tooltipRef);
 
-const tooltipStyle = computed(() => {
+const tooltipStyle = computed<Record<string, string>>(() => {
   if (!hybridViewerStore.hoverData) {
     return {};
   }
@@ -48,7 +48,7 @@ const tooltipStyle = computed(() => {
   };
 });
 
-const originalIndex = computed(() => {
+const originalIndex = computed<number | undefined>(() => {
   const attributes = hybridViewerStore.hoverData?.attributes || {};
   const originalId =
     attributes.vtkOriginalCellIds ??
@@ -65,14 +65,14 @@ const RESERVED_ATTRIBUTE_KEYS = new Set([
   "vtkOriginalPointIds",
 ]);
 
-const hasOtherAttributes = computed(() => {
+const hasOtherAttributes = computed<boolean>(() => {
   const attributes = hybridViewerStore.hoverData?.attributes || {};
   return Object.keys(attributes).some(
     (key) => key !== "vtkOriginalCellIds" && key !== "vtkOriginalPointIds",
   );
 });
 
-const sortedAttributes = computed(() => {
+const sortedAttributes = computed<[string, unknown][]>(() => {
   const attributes = hybridViewerStore.hoverData?.attributes || {};
   return (
     Object.entries(attributes)
@@ -82,7 +82,7 @@ const sortedAttributes = computed(() => {
   );
 });
 
-function capitalize(val: string) {
+function capitalize(val: string): string {
   if (!val) {
     return "";
   }
@@ -90,7 +90,7 @@ function capitalize(val: string) {
   return spaced.charAt(0).toUpperCase() + spaced.slice(1);
 }
 
-const fieldTypeLabel = computed(() => {
+const fieldTypeLabel = computed<string>(() => {
   const fieldType = hybridViewerStore.hoverData?.fieldType;
   return typeof fieldType === "string" ? capitalize(fieldType.toLowerCase()) : "";
 });
@@ -100,7 +100,7 @@ const coordinates = computed<number[] | undefined>(() => {
   return Array.isArray(value) ? (value as number[]) : undefined;
 });
 
-function formatAttributeValue(val: unknown) {
+function formatAttributeValue(val: unknown): string {
   if (Array.isArray(val)) {
     const formattedValues = val.map((value) => {
       if (typeof value === "number") {
diff --git a/app/components/Launcher.vue b/app/components/Launcher.vue
index 4680feb3..9e68e186 100644
--- a/app/components/Launcher.vue
+++ b/app/components/Launcher.vue
@@ -19,7 +19,7 @@ if (infraStore.app_mode !== appMode.CLOUD) {
   infraStore.create_backend();
 }
 
-function cloudCreateBackend() {
+function cloudCreateBackend(): Promise<void> {
   return infraStore.create_backend(email);
 }
 </script>
diff --git a/app/components/Loading.vue b/app/components/Loading.vue
index 57bdcb38..e1b19a6d 100644
--- a/app/components/Loading.vue
+++ b/app/components/Loading.vue
@@ -15,8 +15,8 @@ const extensionStores = computed(() =>
   infraStore.microservices.filter((store) => store.$id !== "back" && store.$id !== "viewer"),
 );
 
-const show = ref(false);
-const progress = ref(0);
+const show = ref<boolean>(false);
+const progress = ref<number>(0);
 
 let progressInterval: ReturnType<typeof setInterval> | undefined = undefined;
 
diff --git a/app/components/Loading/EcoMessages.vue b/app/components/Loading/EcoMessages.vue
index d20d7205..f8764699 100644
--- a/app/components/Loading/EcoMessages.vue
+++ b/app/components/Loading/EcoMessages.vue
@@ -5,7 +5,13 @@ interface Props {
 
 const { appName } = defineProps<Props>();
 
-const ecoMessages = computed(() => [
+interface EcoMessage {
+  icon: string;
+  title: string;
+  message: string;
+}
+
+const ecoMessages = computed<EcoMessage[]>(() => [
   {
     icon: "mdi-leaf",
     title: "Why the wait?",
@@ -24,12 +30,12 @@ const ecoMessages = computed(() => [
 ]);
 
 const MESSAGE_INTERVAL_MS = 5000;
-const currentMessage = ref(0);
+const currentMessage = ref<number>(0);
 let interval: ReturnType<typeof setInterval> | undefined = undefined;
 
 // Fallback only guards against noUncheckedIndexedAccess; currentMessage is always kept in range by the modulo below, so it is never actually used.
 const FALLBACK_ECO_MESSAGE = { icon: "", title: "", message: "" };
-const currentEcoMessage = computed(
+const currentEcoMessage = computed<EcoMessage>(
   () => ecoMessages.value[currentMessage.value] ?? FALLBACK_ECO_MESSAGE,
 );
 
diff --git a/app/components/MissingFilesSelector.vue b/app/components/MissingFilesSelector.vue
index e2ca0e9b..9e6de667 100644
--- a/app/components/MissingFilesSelector.vue
+++ b/app/components/MissingFilesSelector.vue
@@ -7,19 +7,21 @@ import { useBackStore } from "@ogw_front/stores/back";
 
 // Files carry extra app-specific bookkeeping fields once picked up here.
 type UploadFile = File & { isConfigured?: boolean };
-type FilePlan = {
+interface FilePlan {
   has_missing_files: boolean;
   mandatory_files: string[];
   additional_files: string[];
-};
+}
 
 const schema = schemas.opengeodeweb_back.missing_files;
 
-const emit = defineEmits<{
+interface Emits {
   update_values: [value: { additional_files: UploadFile[] }];
   increment_step: [];
   decrement_step: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   multiple: boolean;
@@ -30,23 +32,23 @@ interface Props {
 
 const { multiple, geodeObjectType, filenames, files = [] } = defineProps<Props>();
 
-const accept = ref("");
-const loading = ref(false);
-const has_missing_files = ref(false);
+const accept = ref<string>("");
+const loading = ref<boolean>(false);
+const has_missing_files = ref<boolean>(false);
 const mandatory_files = ref<string[]>([]);
 const additional_files = ref<string[]>([]);
 const toggle_loading = useToggle(loading);
 
-function files_uploaded_event(value: UploadFile[]) {
+function files_uploaded_event(value: UploadFile[]): void {
   emit("update_values", { additional_files: value });
   emit("increment_step");
 }
 
-function isCsvFile(filename: string) {
+function isCsvFile(filename: string): boolean {
   return filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
 }
 
-async function missing_files() {
+async function missing_files(): Promise<void> {
   toggle_loading();
   has_missing_files.value = false;
   mandatory_files.value = [];
diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index e0130286..afce4e6d 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import FetchingData from "@ogw_front/components/FetchingData.vue";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
 import { resolveAllowedObjects } from "@ogw_shared/utils/response_handlers/load.js";
@@ -8,7 +6,10 @@ import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useBackStore } from "@ogw_front/stores/back";
 
 // Mirrors the (unexported) shape produced by shared/utils/response_handlers/load.ts.
-type AllowedObject = { is_loadable: number; object_priority?: number };
+interface AllowedObject {
+  is_loadable: number;
+  object_priority?: number;
+}
 type AllowedObjectMap = Record<string, AllowedObject>;
 
 const schema = schemas.opengeodeweb_back.allowed_objects;
@@ -26,10 +27,10 @@ const { filenames } = defineProps<Props>();
 
 const backStore = useBackStore();
 
-const loading = ref(false);
+const loading = ref<boolean>(false);
 const allowedGeodeObjects = ref<AllowedObjectMap>({});
 const toggleLoading = useToggle(loading);
-const multipleFilesNoCommon = ref(false);
+const multipleFilesNoCommon = ref<boolean>(false);
 
 async function fetchAllowedObjectsList(): Promise<AllowedObjectMap[]> {
   const promiseArray = filenames.map((filename): Promise<{ allowed_objects: AllowedObjectMap }> => {
@@ -40,7 +41,7 @@ async function fetchAllowedObjectsList(): Promise<AllowedObjectMap[]> {
   return responses.map((response) => response.allowed_objects);
 }
 
-function setGeodeObject(geode_object_type: string | undefined) {
+function setGeodeObject(geode_object_type: string | undefined): void {
   if (geode_object_type) {
     emit("update_values", { geode_object_type });
     emit("increment_step");
@@ -48,17 +49,17 @@ function setGeodeObject(geode_object_type: string | undefined) {
 }
 
 // The geode_objects lookup is fixed and keyed by known object type names; a missing entry only happens if the backend reports a type this table doesn't know about.
-function geodeObjectTooltip(key: string, isLoadable: boolean) {
+function geodeObjectTooltip(key: string, isLoadable: boolean): string {
   return isLoadable
     ? (geode_objects[key]?.tooltip ?? key)
     : `Data not loadable with this class (${key})`;
 }
 
-function geodeObjectImage(key: string) {
+function geodeObjectImage(key: string): string | undefined {
   return geode_objects[key]?.image;
 }
 
-async function getAllowedGeodeObjects() {
+async function getAllowedGeodeObjects(): Promise<void> {
   toggleLoading();
   allowedGeodeObjects.value = {};
   multipleFilesNoCommon.value = false;
diff --git a/app/components/PackagesVersions.vue b/app/components/PackagesVersions.vue
index 060d145f..31dbffe5 100644
--- a/app/components/PackagesVersions.vue
+++ b/app/components/PackagesVersions.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 import { Status } from "@ogw_front/utils/status";
 import { useBackStore } from "@ogw_front/stores/back";
-import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 
 interface Props {
   schema: JsonRpcSchema;
@@ -11,12 +9,15 @@ interface Props {
 
 const { schema } = defineProps<Props>();
 
-type PackageVersion = { package: string; version: string };
+interface PackageVersion {
+  package: string;
+  version: string;
+}
 
 const backStore = useBackStore();
 const packages_versions = ref<PackageVersion[]>([]);
 
-async function get_packages_versions() {
+async function get_packages_versions(): Promise<void> {
   await backStore.request(
     { schema },
     {
diff --git a/app/components/Recaptcha.vue b/app/components/Recaptcha.vue
index 0ac8b78d..bb2cd946 100644
--- a/app/components/Recaptcha.vue
+++ b/app/components/Recaptcha.vue
@@ -18,13 +18,13 @@ const email = ref("");
 const launch = ref(false);
 const valid = ref(false);
 const emailRules = [
-  (value: string) => {
+  (value: string): boolean | string => {
     if (value) {
       return true;
     }
     return "E-mail is required.";
   },
-  (value: string) => {
+  (value: string): boolean | string => {
     if (/.+@.+\..+/u.test(value)) {
       return true;
     }
@@ -32,7 +32,7 @@ const emailRules = [
   },
 ];
 
-function submit() {
+function submit(): Promise<void> {
   const infraStore = useInfraStore();
   return infraStore.create_backend(email.value);
 }
diff --git a/app/components/RemoteRenderingView.vue b/app/components/RemoteRenderingView.vue
index 4ef56d11..cee22062 100644
--- a/app/components/RemoteRenderingView.vue
+++ b/app/components/RemoteRenderingView.vue
@@ -10,7 +10,7 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 import ColormapQuickPicker from "@ogw_front/components/Viewer/Options/ColormapQuickPicker.vue";
 import ViewToolbar from "@ogw_front/components/ViewToolbar.vue";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView";
+import { newInstance as vtkRemoteView } from "@kitware/vtk.js/Rendering/Misc/RemoteView";
 
 interface Props {
   viewId?: string;
@@ -28,7 +28,7 @@ const { width: windowWidth, height: windowHeight } = useWindowSize();
 
 const { pickColormap, quickColormap } = useQuickColormap();
 
-async function get_x_y(event: PointerEvent) {
+async function get_x_y(event: PointerEvent): Promise<void> {
   const { offsetX, offsetY, clientX, clientY } = event;
   if (viewerStore.picking_mode === true) {
     viewerStore.set_picked_point(offsetX, offsetY);
@@ -40,9 +40,8 @@ async function get_x_y(event: PointerEvent) {
   }
 }
 
-const connected = ref(false);
-// oxlint-disable-next-line import/no-named-as-default-member
-const view = vtkRemoteView.newInstance({
+const connected = ref<boolean>(false);
+const view = vtkRemoteView({
   rpcWheelEvent: "viewport.mouse.zoom.wheel",
 });
 
@@ -50,7 +49,7 @@ if (location.hostname.split(".")[0] === "localhost") {
   view.setInteractiveRatio(1);
 }
 
-function resize() {
+function resize(): void {
   if (view) {
     view.getCanvasView().setSize(0, 0);
     view.resize();
@@ -73,7 +72,7 @@ watch([width, height], () => {
   resize();
 });
 
-function connect() {
+function connect(): void {
   if (viewerStore.status !== Status.CONNECTED) {
     return;
   }
diff --git a/app/components/Ruler.vue b/app/components/Ruler.vue
index 141a4a7f..12951a15 100644
--- a/app/components/Ruler.vue
+++ b/app/components/Ruler.vue
@@ -11,8 +11,8 @@ const { escapeFunction = undefined } = defineProps<Props>();
 const show = defineModel<boolean>("show", { default: false });
 const hybridViewerStore = useHybridViewerStore();
 
-const localPoint1 = ref([0, 0, 0]);
-const localPoint2 = ref([0, 0, 0]);
+const localPoint1 = ref<number[]>([0, 0, 0]);
+const localPoint2 = ref<number[]>([0, 0, 0]);
 
 watch(
   () => hybridViewerStore.ruler_point1,
@@ -49,7 +49,7 @@ watch(
   },
 );
 
-async function applyManualCoords() {
+async function applyManualCoords(): Promise<void> {
   hybridViewerStore.ruler_point1 = [...localPoint1.value];
   hybridViewerStore.ruler_point2 = [...localPoint2.value];
   await hybridViewerStore.applyRuler();
diff --git a/app/components/Screenshot.vue b/app/components/Screenshot.vue
index 8c1ef3b2..c12f6151 100644
--- a/app/components/Screenshot.vue
+++ b/app/components/Screenshot.vue
@@ -19,14 +19,14 @@ const { width = DEFAULT_PANEL_WIDTH, escapeFunction = undefined } = defineProps<
 
 const output_extensions =
   viewer_schemas.opengeodeweb_viewer.viewer.take_screenshot.properties.output_extension.enum;
-const filename = ref("");
-const output_extension = ref("png");
-const include_background = ref(true);
-const screenshot_type = ref("file");
+const filename = ref<string>("");
+const output_extension = ref<string>("png");
+const include_background = ref<boolean>(true);
+const screenshot_type = ref<string>("file");
 
 const { copy } = useClipboardItems();
 
-async function takeScreenshot() {
+async function takeScreenshot(): Promise<void> {
   const viewerStore = useViewerStore();
   const feedbackStore = useFeedbackStore();
   const current_filename = screenshot_type.value === "file" ? filename.value : "screenshot";
@@ -80,7 +80,7 @@ watch(screenshot_type, (value) => {
   }
 });
 
-function handleClose() {
+function handleClose(): void {
   if (escapeFunction) {
     escapeFunction();
   }
diff --git a/app/components/SearchBar.vue b/app/components/SearchBar.vue
index 6bced246..27c475f0 100644
--- a/app/components/SearchBar.vue
+++ b/app/components/SearchBar.vue
@@ -6,9 +6,11 @@ interface Props {
 
 const { modelValue = "", label = "" } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   "update:modelValue": [value: string];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/ShrinkFilter.vue b/app/components/ShrinkFilter.vue
index ff38933f..dd50754e 100644
--- a/app/components/ShrinkFilter.vue
+++ b/app/components/ShrinkFilter.vue
@@ -17,19 +17,19 @@ const { escapeFunction = undefined } = defineProps<Props>();
 const show = defineModel<boolean>("show", { default: false });
 const dataStore = useDataStore();
 const hybridViewerStore = useHybridViewerStore();
-const targetAllVisible = ref(true);
-const selectedDatasetIds = ref([]);
-const shrinkFactor = ref(DEFAULT_SHRINK_VALUE);
+const targetAllVisible = ref<boolean>(true);
+const selectedDatasetIds = ref<string[]>([]);
+const shrinkFactor = ref<number>(DEFAULT_SHRINK_VALUE);
 
 const allItems = dataStore.refAllItems();
-const availableDatasets = computed(() =>
+const availableDatasets = computed<{ title: string; value: string }[]>(() =>
   allItems.value.map((item) => ({
     title: item.name || item.id,
     value: item.id,
   })),
 );
 
-async function applyShrink() {
+async function applyShrink(): Promise<void> {
   const allIds = allItems.value.map((item) => item.id);
   if (allIds.length === 0) {
     return;
@@ -47,12 +47,12 @@ async function applyShrink() {
 
 const debouncedApply = useDebounceFn(() => applyShrink(), DEBOUNCE_DELAY);
 
-async function resetShrink() {
+async function resetShrink(): Promise<void> {
   shrinkFactor.value = DEFAULT_SHRINK_VALUE;
   await applyShrink();
 }
 
-async function removeShrink() {
+async function removeShrink(): Promise<void> {
   shrinkFactor.value = MAX_SHRINK_VALUE;
   const allIds = allItems.value.map((item) => item.id);
   if (allIds.length > 0) {
diff --git a/app/components/Step.vue b/app/components/Step.vue
index f8b8a7c7..b45fd503 100644
--- a/app/components/Step.vue
+++ b/app/components/Step.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { Ref } from "vue";
 import type { useStepperTree } from "@ogw_front/composables/stepper_tree";
 
 interface StepConfig {
@@ -11,7 +10,7 @@ interface StepConfig {
   };
 }
 
-function truncate(text: string, maxLength: number) {
+function truncate(text: string, maxLength: number): string {
   if (text.length > maxLength) {
     return `${text.slice(0, maxLength)}...`;
   }
@@ -25,9 +24,11 @@ interface Props {
 
 const { stepIndex, stepperTree } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   reset_values: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const { state, increment_step, decrement_step, update_values } = stepperTree;
 const { current_step_index, steps } = toRefs(state) as unknown as {
@@ -35,7 +36,7 @@ const { current_step_index, steps } = toRefs(state) as unknown as {
   steps: Ref<StepConfig[]>;
 };
 
-const sortedChips = computed(() => {
+const sortedChips = computed<string[]>(() => {
   const chips = steps.value[stepIndex]?.chips || [];
   return chips.toSorted((chipA, chipB) =>
     chipA.localeCompare(chipB, undefined, {
diff --git a/app/components/Stepper.vue b/app/components/Stepper.vue
index f82667c6..13f9e189 100644
--- a/app/components/Stepper.vue
+++ b/app/components/Stepper.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
-import type { Ref } from "vue";
 import Step from "@ogw_front/components/Step.vue";
 import type { useStepperTree } from "@ogw_front/composables/stepper_tree";
 
-const emit = defineEmits<{
+interface Emits {
   reset_values: [];
   close: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   stepperTree: ReturnType<typeof useStepperTree>;
diff --git a/app/components/ToolPanel.vue b/app/components/ToolPanel.vue
index 8d894055..58ddf67b 100644
--- a/app/components/ToolPanel.vue
+++ b/app/components/ToolPanel.vue
@@ -22,11 +22,14 @@ const {
 } = defineProps<Props>();
 
 const model = defineModel<boolean>({ default: false });
-const emit = defineEmits<{
+
+interface Emits {
   action: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
-function close() {
+function close(): void {
   if (escapeFunction) {
     escapeFunction();
   }
diff --git a/app/components/ViewToolbar.vue b/app/components/ViewToolbar.vue
index d05dcf5f..8fc8c317 100644
--- a/app/components/ViewToolbar.vue
+++ b/app/components/ViewToolbar.vue
@@ -1,7 +1,4 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { Ref } from "vue";
 import ActionButton from "@ogw_front/components/ActionButton.vue";
 import CameraBookmarkIcon from "@ogw_front/assets/viewer_svgs/camera-bookmark.svg";
 import CameraManager from "@ogw_front/components/CameraManager.vue";
@@ -18,15 +15,15 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 
 const hybridViewerStore = useHybridViewerStore();
 const viewerStore = useViewerStore();
-const showScreenshot = ref(false);
-const showCameraManager = ref(false);
-const showCameraOrientation = ref(false);
-const showZScaling = ref(false);
-const showClippingPlanes = ref(false);
-const showShrinkFilter = ref(false);
-const showRuler = ref(false);
-const gridScale = ref(false);
-const zScale = ref(hybridViewerStore.zScale);
+const showScreenshot = ref<boolean>(false);
+const showCameraManager = ref<boolean>(false);
+const showCameraOrientation = ref<boolean>(false);
+const showZScaling = ref<boolean>(false);
+const showClippingPlanes = ref<boolean>(false);
+const showShrinkFilter = ref<boolean>(false);
+const showRuler = ref<boolean>(false);
+const gridScale = ref<boolean>(false);
+const zScale = ref<number>(hybridViewerStore.zScale);
 const openSubMenus = ref<Record<string, boolean>>({});
 
 interface CameraOptionAction {
@@ -47,7 +44,7 @@ watch(
   },
 );
 
-async function handleZScalingClose() {
+async function handleZScalingClose(): Promise<void> {
   await hybridViewerStore.setZScaling(zScale.value);
   showZScaling.value = false;
 }
@@ -61,7 +58,7 @@ onKeyStroke("Escape", () => {
   }
 });
 
-function closeAllToolsExcept(toolRef: Ref<boolean>) {
+function closeAllToolsExcept(toolRef: Ref<boolean>): void {
   const tools = [
     showCameraOrientation,
     showCameraManager,
@@ -78,7 +75,7 @@ function closeAllToolsExcept(toolRef: Ref<boolean>) {
   }
 }
 
-function toggleTool(toolRef: Ref<boolean>) {
+function toggleTool(toolRef: Ref<boolean>): void {
   closeAllToolsExcept(toolRef);
   toolRef.value = !toolRef.value;
 }
@@ -88,7 +85,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     testId: "resetCameraButton",
     tooltip: "Reset camera",
     icon: "mdi-cube-scan",
-    action: () => {
+    action: (): void => {
       hybridViewerStore.resetCamera();
     },
   },
@@ -97,7 +94,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Center on click",
     icon: "mdi-crosshairs-question",
     color: hybridViewerStore.is_picking ? "primary" : undefined,
-    action: () => {
+    action: (): void => {
       hybridViewerStore.is_picking = !hybridViewerStore.is_picking;
     },
   },
@@ -107,7 +104,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     icon: "mdi-cursor-default-click",
     color: hybridViewerStore.is_hover_highlight ? "primary" : undefined,
     action: hybridViewerStore.is_hover_highlight
-      ? () => {
+      ? (): void => {
           hybridViewerStore.is_hover_highlight = false;
           hybridViewerStore.clearHoverHighlight();
         }
@@ -117,7 +114,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
         title: "Cells",
         testId: "highlightOnHoverCellsButton",
         icon: "mdi-select-all",
-        action: () => {
+        action: (): void => {
           if (
             hybridViewerStore.is_hover_highlight &&
             hybridViewerStore.hover_highlight_field_type === "CELL"
@@ -134,7 +131,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
         title: "Points",
         testId: "highlightOnHoverPointsButton",
         icon: "mdi-select-drag",
-        action: () => {
+        action: (): void => {
           if (
             hybridViewerStore.is_hover_highlight &&
             hybridViewerStore.hover_highlight_field_type === "POINT"
@@ -153,7 +150,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     testId: "cameraOrientationButton",
     tooltip: "Camera orientation",
     icon: "mdi-rotate-3d",
-    action: () => {
+    action: (): void => {
       toggleTool(showCameraOrientation);
     },
   },
@@ -162,7 +159,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Manage camera positions",
     icon: CameraBookmarkIcon,
     iconSize: 34,
-    action: () => {
+    action: (): void => {
       toggleTool(showCameraManager);
     },
   },
@@ -170,7 +167,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     testId: "screenshotButton",
     tooltip: "Take a screenshot",
     icon: "mdi-camera",
-    action: () => {
+    action: (): void => {
       toggleTool(showScreenshot);
     },
   },
@@ -179,7 +176,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Toggle grid scale",
     icon: "mdi-ruler-square",
     color: gridScale.value ? "primary" : undefined,
-    action: () => {
+    action: (): void => {
       const schema = schemas.opengeodeweb_viewer.viewer.grid_scale;
       const params = { visibility: !gridScale.value };
       viewerStore.request(
@@ -200,7 +197,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     testId: "zScalingButton",
     tooltip: "Z Scaling Control",
     icon: "mdi-sort",
-    action: () => {
+    action: (): void => {
       toggleTool(showZScaling);
     },
   },
@@ -209,7 +206,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Clipping Planes",
     icon: "mdi-content-cut",
     color: showClippingPlanes.value ? "primary" : undefined,
-    action: () => {
+    action: (): void => {
       toggleTool(showClippingPlanes);
     },
   },
@@ -218,7 +215,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Shrink Filter",
     icon: "mdi-arrow-collapse-all",
     color: showShrinkFilter.value ? "primary" : undefined,
-    action: () => {
+    action: (): void => {
       toggleTool(showShrinkFilter);
     },
   },
@@ -227,7 +224,7 @@ const camera_options = computed<CameraOptionAction[]>(() => [
     tooltip: "Ruler",
     icon: "mdi-ruler",
     color: showRuler.value ? "primary" : undefined,
-    action: () => {
+    action: (): void => {
       toggleTool(showRuler);
     },
   },
diff --git a/app/components/Viewer/ContextMenu/CenterButton.vue b/app/components/Viewer/ContextMenu/CenterButton.vue
index db90ea6d..4bb43f43 100644
--- a/app/components/Viewer/ContextMenu/CenterButton.vue
+++ b/app/components/Viewer/ContextMenu/CenterButton.vue
@@ -9,10 +9,12 @@ interface Props {
 
 const { isOverTreeview, isOverToolbar = false } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   drag: [event: MouseEvent];
   click: [event: MouseEvent];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const ADAPTIVE_BLUR_VAL = "15px";
 const ADAPTIVE_OPACITY_VAL = 0.85;
@@ -51,14 +53,14 @@ let dragMoved = false;
 let dragStartClientX = 0;
 let dragStartClientY = 0;
 
-function onMouseDown(event: MouseEvent) {
+function onMouseDown(event: MouseEvent): void {
   dragMoved = false;
   dragStartClientX = event.clientX;
   dragStartClientY = event.clientY;
   emit("drag", event);
 }
 
-function onMouseUp(event: MouseEvent) {
+function onMouseUp(event: MouseEvent): void {
   const deltaX = event.clientX - dragStartClientX;
   const deltaY = event.clientY - dragStartClientY;
   if (Math.hypot(deltaX, deltaY) > dragThreshold) {
@@ -66,7 +68,7 @@ function onMouseUp(event: MouseEvent) {
   }
 }
 
-function onCenterClick(event: MouseEvent) {
+function onCenterClick(event: MouseEvent): void {
   event.stopPropagation();
   if (!dragMoved) {
     emit("click", event);
diff --git a/app/components/Viewer/ContextMenu/CircularItems.vue b/app/components/Viewer/ContextMenu/CircularItems.vue
index 17f2469a..50f3dadb 100644
--- a/app/components/Viewer/ContextMenu/CircularItems.vue
+++ b/app/components/Viewer/ContextMenu/CircularItems.vue
@@ -22,7 +22,7 @@ const ANGLE_315 = 315;
 
 const menuStore = useMenuStore();
 
-function getItemStyle(index: number) {
+function getItemStyle(index: number): Record<string, string> {
   const angle = (index / menuItemCount) * 2 * Math.PI;
   return {
     transform: `translate(${Math.cos(angle) * RADIUS}px, ${Math.sin(angle) * RADIUS}px)`,
@@ -32,7 +32,7 @@ function getItemStyle(index: number) {
   };
 }
 
-function getTooltipLocation(index: number) {
+function getTooltipLocation(index: number): string {
   const angle = (index / menuItemCount) * FULL_ANGLE;
   if (angle < ANGLE_45 || angle >= ANGLE_315) {
     return "right";
@@ -46,7 +46,7 @@ function getTooltipLocation(index: number) {
   return "bottom";
 }
 
-function getTooltipOrigin(index: number) {
+function getTooltipOrigin(index: number): string {
   const angle = (index / menuItemCount) * FULL_ANGLE;
   if (angle < ANGLE_45 || angle >= ANGLE_315) {
     return "left";
diff --git a/app/components/Viewer/ContextMenu/ContextMenu.vue b/app/components/Viewer/ContextMenu/ContextMenu.vue
index 3d6c0a88..a98188dc 100644
--- a/app/components/Viewer/ContextMenu/ContextMenu.vue
+++ b/app/components/Viewer/ContextMenu/ContextMenu.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import CenterButton from "@ogw_front/components/Viewer/ContextMenu/CenterButton.vue";
 import CircularItems from "@ogw_front/components/Viewer/ContextMenu/CircularItems.vue";
+import type { Component } from "vue";
 import InfoCard from "@ogw_front/components/Viewer/ContextMenu/InfoCard.vue";
 import { useEventListener } from "@vueuse/core";
 import { useMenuStore } from "@ogw_front/stores/menu";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
-import type { Component } from "vue";
 
 interface Props {
   id: string;
@@ -33,15 +31,20 @@ const treeviewStore = useTreeviewStore();
 
 const meta_data = computed(() => menuStore.current_meta_data || {});
 
-const show_menu = ref(true);
-const showName = ref(false);
-const isDragging = ref(false);
-const dragStartX = ref(0);
-const dragStartY = ref(0);
-const menuX = ref(x);
-const menuY = ref(y);
+const show_menu = ref<boolean>(true);
+const showName = ref<boolean>(false);
+const isDragging = ref<boolean>(false);
+const dragStartX = ref<number>(0);
+const dragStartY = ref<number>(0);
+const menuX = ref<number>(x);
+const menuY = ref<number>(y);
+
+interface Position {
+  x: number;
+  y: number;
+}
 
-function clampPosition(posX: number, posY: number) {
+function clampPosition(posX: number, posY: number): Position {
   const margin = RADIUS + MARGIN_OFFSET;
   return {
     x: Math.min(Math.max(posX, margin), containerWidth - margin),
@@ -49,13 +52,13 @@ function clampPosition(posX: number, posY: number) {
   };
 }
 
-function startDrag(event: MouseEvent) {
+function startDrag(event: MouseEvent): void {
   isDragging.value = true;
   dragStartX.value = event.clientX - menuX.value;
   dragStartY.value = event.clientY - menuY.value;
 }
 
-function handleDrag(event: MouseEvent) {
+function handleDrag(event: MouseEvent): void {
   const { x: clampedX, y: clampedY } = clampPosition(
     event.clientX - dragStartX.value,
     event.clientY - dragStartY.value,
@@ -65,7 +68,7 @@ function handleDrag(event: MouseEvent) {
   menuStore.setMenuPosition(clampedX, clampedY);
 }
 
-function stopDrag(event: MouseEvent) {
+function stopDrag(event: MouseEvent): void {
   isDragging.value = false;
   event.stopPropagation();
   menuStore.setMenuPosition(menuX.value, menuY.value);
@@ -116,9 +119,9 @@ watch(
   { immediate: true },
 );
 
-const menuItemCount = computed(() => menu_items.value.length);
+const menuItemCount = computed<number>(() => menu_items.value.length);
 
-const isOverTreeview = computed(() => {
+const isOverTreeview = computed<boolean>(() => {
   const hasAdditional = treeviewStore.opened_views.some((view) => view.id !== "main");
   const hasMain = treeviewStore.opened_views.some((view) => view.id === "main");
   const firstColWidth = hasMain ? treeviewStore.panelWidth : 0;
@@ -132,7 +135,7 @@ const isOverTreeview = computed(() => {
   return menuX.value < treeviewWidth;
 });
 
-const isOverToolbar = computed(() => {
+const isOverToolbar = computed<boolean>(() => {
   const toolbarEl = document.querySelector(".view-toolbar");
   if (!toolbarEl) {
     return false;
@@ -150,7 +153,7 @@ const isOverToolbar = computed(() => {
   );
 });
 
-function getMenuStyle() {
+function getMenuStyle(): Record<string, string> {
   return {
     position: "fixed" as const,
     left: `${menuStore.containerLeft + menuX.value - RADIUS}px`,
@@ -158,7 +161,7 @@ function getMenuStyle() {
   };
 }
 
-function toggleShowName() {
+function toggleShowName(): void {
   showName.value = !showName.value;
 }
 </script>
diff --git a/app/components/Viewer/ContextMenu/ContextMenuItem.vue b/app/components/Viewer/ContextMenu/ContextMenuItem.vue
index b8fe5154..4f851109 100644
--- a/app/components/Viewer/ContextMenu/ContextMenuItem.vue
+++ b/app/components/Viewer/ContextMenu/ContextMenuItem.vue
@@ -55,7 +55,7 @@ const TREEVIEW_MARGIN_RIGHT = 20;
 const TREEVIEW_ICON_WIDTH = 48;
 
 const treeviewStore = useTreeviewStore();
-const isOverTreeview = computed(() => {
+const isOverTreeview = computed<boolean>(() => {
   const hasAdditional = treeviewStore.opened_views.some((view) => view.id !== "main");
   const hasMain = treeviewStore.opened_views.some((view) => view.id === "main");
   const firstColWidth = hasMain ? treeviewStore.panelWidth : 0;
@@ -69,7 +69,7 @@ const isOverTreeview = computed(() => {
   return buttonCoords.value.x < treeviewWidth;
 });
 
-const isOverToolbar = computed(() => {
+const isOverToolbar = computed<boolean>(() => {
   const toolbarEl = document.querySelector(".view-toolbar");
   if (!toolbarEl) {
     return false;
@@ -84,7 +84,7 @@ const isOverToolbar = computed(() => {
   );
 });
 
-const computedItemStyles = computed(() => {
+const computedItemStyles = computed<Record<string, string>>(() => {
   if (isOverTreeview.value || isOverToolbar.value) {
     return {
       "--adaptive-blur": "15px",
@@ -95,13 +95,15 @@ const computedItemStyles = computed(() => {
   return adaptiveStyles.value;
 });
 
-const is_active = computed(() => menuStore.active_item_index === index);
+const is_active = computed<boolean>(() => menuStore.active_item_index === index);
 const optionsRef = ref<HTMLElement | undefined>(undefined);
 const { height: optionsHeight } = useElementSize(optionsRef);
 
-const maxCardHeight = computed(() => Math.min(CARD_HEIGHT, menuStore.containerHeight - OFFSET));
+const maxCardHeight = computed<number>(() =>
+  Math.min(CARD_HEIGHT, menuStore.containerHeight - OFFSET),
+);
 
-const optionsStyle = computed(() => {
+const optionsStyle = computed<Record<string, string>>(() => {
   if (!is_active.value || !optionsHeight.value) {
     return {};
   }
@@ -120,7 +122,7 @@ const optionsStyle = computed(() => {
   return { top: `calc(50% + ${offsetY}px)` };
 });
 
-const optionsClass = computed(() => {
+const optionsClass = computed<string>(() => {
   const loc = itemProps.tooltip_location;
   const margin = MARGIN;
   const radius = RADIUS;
@@ -132,7 +134,7 @@ const optionsClass = computed(() => {
   return menuStore.menuX - radius - margin - CARD_WIDTH < 0 ? "options-right" : "options-left";
 });
 
-function toggleOptions() {
+function toggleOptions(): void {
   menuStore.toggleItemOptions(index);
 }
 
diff --git a/app/components/Viewer/ContextMenu/InfoCard.vue b/app/components/Viewer/ContextMenu/InfoCard.vue
index 83359fc9..6871cf72 100644
--- a/app/components/Viewer/ContextMenu/InfoCard.vue
+++ b/app/components/Viewer/ContextMenu/InfoCard.vue
@@ -7,7 +7,7 @@ import { useMenuStore } from "@ogw_front/stores/menu";
 
 interface Props {
   show: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // oxlint-disable-next-line @typescript-eslint/no-explicit-any
   metaData: Record<string, any>;
 }
 
@@ -28,7 +28,7 @@ const TRUNCATE_END_CHARS = 7;
 const { copy, copied } = useClipboard({ copiedDuring: COPIED_TIMEOUT });
 const copiedId = ref("");
 
-function isCopied(id: string | undefined) {
+function isCopied(id: string | undefined): boolean {
   return copied.value && copiedId.value === id;
 }
 
@@ -41,7 +41,7 @@ interface MeshComponentInfo {
   category?: string;
 }
 
-const componentName = ref("");
+const componentName = ref<string>("");
 const componentItem = ref<MeshComponentInfo | undefined>(undefined);
 
 function asString(value: unknown): string | undefined {
@@ -72,7 +72,7 @@ watch(
   { immediate: true },
 );
 
-const cleanName = computed(() => {
+const cleanName = computed<string>(() => {
   const meta = menuStore.current_meta_data;
   if (!meta) {
     return "Unnamed Object";
@@ -83,7 +83,7 @@ const cleanName = computed(() => {
   return asString(meta.name) ?? "Unnamed Object";
 });
 
-const displayTitle = computed(() => {
+const displayTitle = computed<string>(() => {
   const name = cleanName.value;
   if (!name) {
     return "";
@@ -91,7 +91,7 @@ const displayTitle = computed(() => {
   return middleTruncate(name, TRUNCATE_MAX_LENGTH, TRUNCATE_START_CHARS, TRUNCATE_END_CHARS);
 });
 
-const displayComponentTitle = computed(() => {
+const displayComponentTitle = computed<string>(() => {
   if (!componentItem.value) {
     return "";
   }
@@ -103,7 +103,7 @@ const displayComponentTitle = computed(() => {
   );
 });
 
-async function copyId(targetId: string | undefined) {
+async function copyId(targetId: string | undefined): Promise<void> {
   if (!targetId) {
     return;
   }
@@ -115,7 +115,7 @@ async function copyId(targetId: string | undefined) {
   }
 }
 
-function formatId(id: string | undefined) {
+function formatId(id: string | undefined): string {
   if (!id) {
     return "";
   }
@@ -125,7 +125,7 @@ function formatId(id: string | undefined) {
   return `${id.slice(0, ID_SLICE_START)}...${id.slice(id.length - ID_SLICE_END_OFFSET)}`;
 }
 
-const formattedId = computed(() => formatId(metaData.id));
+const formattedId = computed<string>(() => formatId(metaData.id));
 </script>
 
 <template>
diff --git a/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue b/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
index 389c2e2c..ef3eb691 100644
--- a/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
+++ b/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
@@ -1,19 +1,15 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import ViewerOptionsWidthSlider from "@ogw_front/components/Viewer/Options/Sliders/Width.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -27,7 +23,7 @@ const { itemProps } = defineProps<Props>();
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshEdgesVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -36,7 +32,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const width = computed({
+const width = computed<number>({
   get: () => dataStyleStore.meshEdgesWidth(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -45,7 +41,7 @@ const width = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshEdgesActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -63,7 +59,7 @@ const color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -75,7 +71,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -84,7 +80,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -97,7 +93,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshEdgesVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -115,7 +111,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_name = computed({
+const edge_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -127,7 +123,7 @@ const edge_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_item = computed({
+const edge_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -136,7 +132,7 @@ const edge_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_range = computed({
+const edge_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -149,7 +145,7 @@ const edge_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_color_map = computed({
+const edge_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Mesh/CellsOptions.vue b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
index 34aea0dc..a9e40562 100644
--- a/app/components/Viewer/Generic/Mesh/CellsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
@@ -1,17 +1,13 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Texture {
   id: string;
@@ -32,7 +28,7 @@ const { itemProps, btnImage, tooltip = "Cells options" } = defineProps<Props>();
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshCellsVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -41,7 +37,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshCellsActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -69,7 +65,7 @@ const textures = computed<Texture[] | undefined>({
   },
 });
 
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshCellsVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -81,7 +77,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshCellsVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -90,7 +86,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshCellsVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -103,7 +99,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshCellsVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -121,7 +117,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const cell_attribute_name = computed({
+const cell_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshCellsCellAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -133,7 +129,7 @@ const cell_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const cell_attribute_item = computed({
+const cell_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshCellsCellAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -142,7 +138,7 @@ const cell_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const cell_attribute_range = computed({
+const cell_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshCellsCellAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -155,7 +151,7 @@ const cell_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const cell_attribute_color_map = computed({
+const cell_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshCellsCellAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
index 54b2e37d..e7ca8314 100644
--- a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import ViewerOptionsWidthSlider from "@ogw_front/components/Viewer/Options/Sliders/Width.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -28,7 +24,7 @@ const { itemProps, btnImage, tooltip = "Edges options" } = defineProps<Props>();
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshEdgesVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -37,7 +33,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const size = computed({
+const size = computed<number>({
   get: () => dataStyleStore.meshEdgesWidth(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -46,7 +42,7 @@ const size = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshEdgesActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -64,7 +60,7 @@ const color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -76,7 +72,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -85,7 +81,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshEdgesVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -98,7 +94,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshEdgesVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -116,7 +112,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_name = computed({
+const edge_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -128,7 +124,7 @@ const edge_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_item = computed({
+const edge_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -137,7 +133,7 @@ const edge_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_range = computed({
+const edge_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -150,7 +146,7 @@ const edge_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const edge_attribute_color_map = computed({
+const edge_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshEdgesEdgeAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Mesh/PointsOptions.vue b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
index 6d558c08..c50fd75e 100644
--- a/app/components/Viewer/Generic/Mesh/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsSizeSlider from "@ogw_front/components/Viewer/Options/Sliders/Size.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -28,7 +24,7 @@ const { itemProps, btnImage, tooltip = "Points options" } = defineProps<Props>()
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshPointsVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -37,7 +33,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const size = computed({
+const size = computed<number>({
   get: () => dataStyleStore.meshPointsSize(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -46,7 +42,7 @@ const size = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshPointsActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -64,7 +60,7 @@ const color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPointsVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -76,7 +72,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPointsVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -85,7 +81,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPointsVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -98,7 +94,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshPointsVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
index 6fcd1bd0..c6f01a97 100644
--- a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
@@ -1,17 +1,13 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Texture {
   id: string;
@@ -43,7 +39,7 @@ const {
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshPolygonsVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -52,7 +48,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshPolygonsActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -80,7 +76,7 @@ const textures = computed<Texture[] | undefined>({
   },
 });
 
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -92,7 +88,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -101,7 +97,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -116,7 +112,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -135,7 +131,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_name = computed({
+const polygon_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -147,7 +143,7 @@ const polygon_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_item = computed({
+const polygon_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -156,7 +152,7 @@ const polygon_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_range = computed({
+const polygon_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -171,7 +167,7 @@ const polygon_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_color_map = computed({
+const polygon_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
index 4c555e62..f5d67ee9 100644
--- a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
@@ -1,17 +1,13 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -27,7 +23,7 @@ const { itemProps, btnImage, tooltip = "Polyhedra options" } = defineProps<Props
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshPolyhedraVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -36,7 +32,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshPolyhedraActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -54,7 +50,7 @@ const color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -66,7 +62,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -75,7 +71,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -90,7 +86,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -109,7 +105,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_name = computed({
+const polyhedron_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -121,7 +117,7 @@ const polyhedron_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_item = computed({
+const polyhedron_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -130,7 +126,7 @@ const polyhedron_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_range = computed({
+const polyhedron_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -145,7 +141,7 @@ const polyhedron_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_color_map = computed({
+const polyhedron_attribute_color_map = computed<Map<string, RGBAColor>>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Model/BlocksOptions.vue b/app/components/Viewer/Generic/Model/BlocksOptions.vue
index 4f4fcb3a..6eb05077 100644
--- a/app/components/Viewer/Generic/Model/BlocksOptions.vue
+++ b/app/components/Viewer/Generic/Model/BlocksOptions.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// This file exhaustively wires group- and per-component style properties (visibility/color/coloring/vertex+polyhedron attributes) to the style store; the formatter's line-wrapping of the resulting store calls pushes the file past max-lines even though no logic was added.
-// oxlint-disable eslint/max-lines
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
@@ -23,7 +19,7 @@ const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
 // Visibility
-const blocksVisibility = computed({
+const blocksVisibility = computed<boolean>({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Block"),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVisibility(modelId, targetBlockIds, newValue);
@@ -31,7 +27,7 @@ const blocksVisibility = computed({
   },
 });
 
-const blockVisibility = computed({
+const blockVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelBlockVisibility(modelId, blockId) as boolean | undefined,
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -86,7 +82,7 @@ const blockActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const blocksVertexAttributeName = computed({
+const blocksVertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -97,7 +93,7 @@ const blocksVertexAttributeName = computed({
   },
 });
 
-const blocksVertexAttributeItem = computed({
+const blocksVertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVertexAttributeItem(modelId, targetBlockIds, newValue);
@@ -105,7 +101,7 @@ const blocksVertexAttributeItem = computed({
   },
 });
 
-const blocksVertexAttributeRange = computed({
+const blocksVertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -122,7 +118,7 @@ const blocksVertexAttributeRange = computed({
   },
 });
 
-const blocksVertexAttributeColorMap = computed({
+const blocksVertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVertexAttributeColorMap(modelId, targetBlockIds, newValue);
@@ -142,7 +138,7 @@ const blocksVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const blocksPolyhedronAttributeName = computed({
+const blocksPolyhedronAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -153,7 +149,7 @@ const blocksPolyhedronAttributeName = computed({
   },
 });
 
-const blocksPolyhedronAttributeItem = computed({
+const blocksPolyhedronAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksPolyhedronAttributeItem(modelId, targetBlockIds, newValue);
@@ -161,7 +157,7 @@ const blocksPolyhedronAttributeItem = computed({
   },
 });
 
-const blocksPolyhedronAttributeRange = computed({
+const blocksPolyhedronAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -178,7 +174,7 @@ const blocksPolyhedronAttributeRange = computed({
   },
 });
 
-const blocksPolyhedronAttributeColorMap = computed({
+const blocksPolyhedronAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksPolyhedronAttributeColorMap(
@@ -204,7 +200,7 @@ const blocksPolyhedronAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeName(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined || newValue === undefined) {
@@ -215,7 +211,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeItem(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -226,7 +222,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeRange(modelId, blockId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -238,7 +234,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeColorMap(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -261,7 +257,7 @@ const vertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const polyhedronAttributeName = computed({
+const polyhedronAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeName(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined || newValue === undefined) {
@@ -272,7 +268,7 @@ const polyhedronAttributeName = computed({
   },
 });
 
-const polyhedronAttributeItem = computed({
+const polyhedronAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeItem(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -283,7 +279,7 @@ const polyhedronAttributeItem = computed({
   },
 });
 
-const polyhedronAttributeRange = computed({
+const polyhedronAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeRange(modelId, blockId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -300,7 +296,7 @@ const polyhedronAttributeRange = computed({
   },
 });
 
-const polyhedronAttributeColorMap = computed({
+const polyhedronAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeColorMap(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
diff --git a/app/components/Viewer/Generic/Model/CornersOptions.vue b/app/components/Viewer/Generic/Model/CornersOptions.vue
index 7f4dbdad..93a14de7 100644
--- a/app/components/Viewer/Generic/Model/CornersOptions.vue
+++ b/app/components/Viewer/Generic/Model/CornersOptions.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
@@ -21,7 +19,7 @@ const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
 // Visibility
-const cornersVisibility = computed({
+const cornersVisibility = computed<boolean>({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Corner"),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVisibility(modelId, targetCornerIds, newValue);
@@ -29,7 +27,7 @@ const cornersVisibility = computed({
   },
 });
 
-const cornerVisibility = computed({
+const cornerVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelCornerVisibility(modelId, cornerId) as boolean | undefined,
   set: async (newValue) => {
     if (cornerId === undefined) {
@@ -84,7 +82,7 @@ const cornerActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const cornersVertexAttributeName = computed({
+const cornersVertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -95,7 +93,7 @@ const cornersVertexAttributeName = computed({
   },
 });
 
-const cornersVertexAttributeItem = computed({
+const cornersVertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVertexAttributeItem(modelId, targetCornerIds, newValue);
@@ -103,7 +101,7 @@ const cornersVertexAttributeItem = computed({
   },
 });
 
-const cornersVertexAttributeRange = computed({
+const cornersVertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -120,7 +118,7 @@ const cornersVertexAttributeRange = computed({
   },
 });
 
-const cornersVertexAttributeColorMap = computed({
+const cornersVertexAttributeColorMap = computed<ColorMap | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVertexAttributeColorMap(modelId, targetCornerIds, newValue);
@@ -142,7 +140,7 @@ const cornersVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeName(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined || newValue === undefined) {
@@ -153,7 +151,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeItem(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined) {
@@ -164,7 +162,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeRange(modelId, cornerId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -176,7 +174,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<ColorMap | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeColorMap(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined) {
diff --git a/app/components/Viewer/Generic/Model/EdgesOptions.vue b/app/components/Viewer/Generic/Model/EdgesOptions.vue
index 7496fb8f..b4225bf7 100644
--- a/app/components/Viewer/Generic/Model/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Model/EdgesOptions.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
diff --git a/app/components/Viewer/Generic/Model/LinesOptions.vue b/app/components/Viewer/Generic/Model/LinesOptions.vue
index bd626af6..e0ffc98f 100644
--- a/app/components/Viewer/Generic/Model/LinesOptions.vue
+++ b/app/components/Viewer/Generic/Model/LinesOptions.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// This file exhaustively wires group- and per-component style properties (visibility/color/coloring/vertex+polyhedron attributes) to the style store; the formatter's line-wrapping of the resulting store calls pushes the file past max-lines even though no logic was added.
-// oxlint-disable eslint/max-lines
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
@@ -23,7 +19,7 @@ const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
 // Visibility
-const linesVisibility = computed({
+const linesVisibility = computed<boolean>({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Line"),
   set: async (newValue) => {
     await dataStyleStore.setModelLinesVisibility(modelId, targetLineIds, newValue);
@@ -31,7 +27,7 @@ const linesVisibility = computed({
   },
 });
 
-const lineVisibility = computed({
+const lineVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelLineVisibility(modelId, lineId) as boolean | undefined,
   set: async (newValue) => {
     if (lineId === undefined) {
@@ -86,7 +82,7 @@ const lineActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const linesVertexAttributeName = computed({
+const linesVertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -97,7 +93,7 @@ const linesVertexAttributeName = computed({
   },
 });
 
-const linesVertexAttributeItem = computed({
+const linesVertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelLinesVertexAttributeItem(modelId, targetLineIds, newValue);
@@ -105,7 +101,7 @@ const linesVertexAttributeItem = computed({
   },
 });
 
-const linesVertexAttributeRange = computed({
+const linesVertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -122,7 +118,7 @@ const linesVertexAttributeRange = computed({
   },
 });
 
-const linesVertexAttributeColorMap = computed({
+const linesVertexAttributeColorMap = computed<RGBAColorMap | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelLinesVertexAttributeColorMap(modelId, targetLineIds, newValue);
@@ -138,7 +134,7 @@ const linesVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const linesEdgeAttributeName = computed({
+const linesEdgeAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -149,7 +145,7 @@ const linesEdgeAttributeName = computed({
   },
 });
 
-const linesEdgeAttributeItem = computed({
+const linesEdgeAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelLinesEdgeAttributeItem(modelId, targetLineIds, newValue);
@@ -157,7 +153,7 @@ const linesEdgeAttributeItem = computed({
   },
 });
 
-const linesEdgeAttributeRange = computed({
+const linesEdgeAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -169,7 +165,7 @@ const linesEdgeAttributeRange = computed({
   },
 });
 
-const linesEdgeAttributeColorMap = computed({
+const linesEdgeAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelLinesEdgeAttributeColorMap(modelId, targetLineIds, newValue);
@@ -186,7 +182,7 @@ const linesEdgeAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeName(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined || newValue === undefined) {
@@ -197,7 +193,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeItem(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined) {
@@ -208,7 +204,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeRange(modelId, lineId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -220,7 +216,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<ColorMap | undefined>({
   get: () => dataStyleStore.modelLinesVertexAttributeColorMap(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined) {
@@ -243,7 +239,7 @@ const vertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const edgeAttributeName = computed({
+const edgeAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeName(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined || newValue === undefined) {
@@ -254,7 +250,7 @@ const edgeAttributeName = computed({
   },
 });
 
-const edgeAttributeItem = computed({
+const edgeAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeItem(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined) {
@@ -265,7 +261,7 @@ const edgeAttributeItem = computed({
   },
 });
 
-const edgeAttributeRange = computed({
+const edgeAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeRange(modelId, lineId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -277,7 +273,7 @@ const edgeAttributeRange = computed({
   },
 });
 
-const edgeAttributeColorMap = computed({
+const edgeAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelLinesEdgeAttributeColorMap(modelId, lineId),
   set: async (newValue) => {
     if (lineId === undefined) {
diff --git a/app/components/Viewer/Generic/Model/ModelStyleCard.vue b/app/components/Viewer/Generic/Model/ModelStyleCard.vue
index 7ce830b3..880f9bfb 100644
--- a/app/components/Viewer/Generic/Model/ModelStyleCard.vue
+++ b/app/components/Viewer/Generic/Model/ModelStyleCard.vue
@@ -1,26 +1,23 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import BlocksOptions from "./BlocksOptions.vue";
+import CornersOptions from "./CornersOptions.vue";
+import LinesOptions from "./LinesOptions.vue";
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
+import SurfacesOptions from "./SurfacesOptions.vue";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
-
-import BlocksOptions from "./BlocksOptions.vue";
-import CornersOptions from "./CornersOptions.vue";
-import LinesOptions from "./LinesOptions.vue";
-import SurfacesOptions from "./SurfacesOptions.vue";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 const dataStore = useDataStore();
 const treeviewStore = useTreeviewStore();
 
-function getBatchComponentIds(currentId: string) {
+function getBatchComponentIds(currentId: string): string[] {
   const { activeItems } = treeviewStore;
   if (activeItems.includes(currentId) && activeItems.length > 1) {
     return activeItems;
@@ -29,14 +26,16 @@ function getBatchComponentIds(currentId: string) {
 }
 
 interface Props {
-  itemProps: Record<string, any>;
+  itemProps: Record<string, unknown>;
 }
 
 const { itemProps } = defineProps<Props>();
 
-const modelId = computed(() => itemProps.meta_data.modelId || itemProps.id);
-const componentId = computed(() => itemProps.meta_data.pickedComponentId);
-const selection = computed(() => dataStyleStore.visibleMeshComponents(modelId.value).value || []);
+const modelId = computed<string>(() => itemProps.meta_data.modelId || itemProps.id);
+const componentId = computed<string | undefined>(() => itemProps.meta_data.pickedComponentId);
+const selection = computed<string[]>(
+  () => dataStyleStore.visibleMeshComponents(modelId.value).value || [],
+);
 const componentType = ref<string | undefined>(undefined);
 
 watch(
@@ -87,7 +86,7 @@ watch(
   { immediate: true },
 );
 
-const modelVisibility = computed({
+const modelVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelVisibility(modelId.value),
   set: async (newValue) => {
     if (newValue === undefined) {
diff --git a/app/components/Viewer/Generic/Model/ModelStyleOptions.vue b/app/components/Viewer/Generic/Model/ModelStyleOptions.vue
index 26cdd82b..67278cbc 100644
--- a/app/components/Viewer/Generic/Model/ModelStyleOptions.vue
+++ b/app/components/Viewer/Generic/Model/ModelStyleOptions.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import ModelColor from "@ogw_front/assets/viewer_svgs/model_component_color.svg";
-import ModelStyleCard from "./ModelStyleCard.vue";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import ModelColor from "@ogw_front/assets/viewer_svgs/model_component_color.svg";
+import ModelStyleCard from "./ModelStyleCard.vue";
 
 interface Props {
   itemProps: ItemProps & { index: number };
diff --git a/app/components/Viewer/Generic/Model/PointsOptions.vue b/app/components/Viewer/Generic/Model/PointsOptions.vue
index f8f0fdfd..49960693 100644
--- a/app/components/Viewer/Generic/Model/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Model/PointsOptions.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg";
 import ViewerOptionsSizeSlider from "@ogw_front/components/Viewer/Options/Sliders/Size.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
@@ -21,9 +19,11 @@ interface Props {
 
 const { itemProps } = defineProps<Props>();
 
-const id = computed(() => (itemProps.meta_data.modelId as string | undefined) || itemProps.id);
+const id = computed<string>(
+  () => (itemProps.meta_data.modelId as string | undefined) || itemProps.id,
+);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.modelPointsVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -32,7 +32,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const size = computed({
+const size = computed<number>({
   get: () => dataStyleStore.modelPointsSize(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Generic/Model/SurfacesOptions.vue b/app/components/Viewer/Generic/Model/SurfacesOptions.vue
index b83d35f9..78b17d18 100644
--- a/app/components/Viewer/Generic/Model/SurfacesOptions.vue
+++ b/app/components/Viewer/Generic/Model/SurfacesOptions.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// This file exhaustively wires group- and per-component style properties (visibility/color/coloring/vertex+polyhedron attributes) to the style store; the formatter's line-wrapping of the resulting store calls pushes the file past max-lines even though no logic was added.
-// oxlint-disable eslint/max-lines
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
@@ -23,7 +19,7 @@ const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
 // Visibility
-const surfacesVisibility = computed({
+const surfacesVisibility = computed<boolean>({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Surface"),
   set: async (newValue) => {
     await dataStyleStore.setModelSurfacesVisibility(modelId, targetSurfaceIds, newValue);
@@ -31,7 +27,7 @@ const surfacesVisibility = computed({
   },
 });
 
-const surfaceVisibility = computed({
+const surfaceVisibility = computed<boolean>({
   get: () => dataStyleStore.modelSurfaceVisibility(modelId, surfaceId) as boolean | undefined,
   set: async (newValue) => {
     if (surfaceId === undefined) {
@@ -86,7 +82,7 @@ const surfaceActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const surfacesVertexAttributeName = computed({
+const surfacesVertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -97,7 +93,7 @@ const surfacesVertexAttributeName = computed({
   },
 });
 
-const surfacesVertexAttributeItem = computed({
+const surfacesVertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelSurfacesVertexAttributeItem(modelId, targetSurfaceIds, newValue);
@@ -105,7 +101,7 @@ const surfacesVertexAttributeItem = computed({
   },
 });
 
-const surfacesVertexAttributeRange = computed({
+const surfacesVertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -122,7 +118,7 @@ const surfacesVertexAttributeRange = computed({
   },
 });
 
-const surfacesVertexAttributeColorMap = computed({
+const surfacesVertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelSurfacesVertexAttributeColorMap(
@@ -147,7 +143,7 @@ const surfacesVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const surfacesPolygonAttributeName = computed({
+const surfacesPolygonAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeName(modelId),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -158,7 +154,7 @@ const surfacesPolygonAttributeName = computed({
   },
 });
 
-const surfacesPolygonAttributeItem = computed({
+const surfacesPolygonAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeItem(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelSurfacesPolygonAttributeItem(modelId, targetSurfaceIds, newValue);
@@ -166,7 +162,7 @@ const surfacesPolygonAttributeItem = computed({
   },
 });
 
-const surfacesPolygonAttributeRange = computed({
+const surfacesPolygonAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeRange(modelId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -183,7 +179,7 @@ const surfacesPolygonAttributeRange = computed({
   },
 });
 
-const surfacesPolygonAttributeColorMap = computed({
+const surfacesPolygonAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeColorMap(modelId),
   set: async (newValue) => {
     await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(
@@ -209,7 +205,7 @@ const surfacesPolygonAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeName(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined || newValue === undefined) {
@@ -220,7 +216,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeItem(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined) {
@@ -231,7 +227,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeRange(modelId, surfaceId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -248,7 +244,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelSurfacesVertexAttributeColorMap(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined) {
@@ -273,7 +269,7 @@ const vertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const polygonAttributeName = computed({
+const polygonAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeName(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined || newValue === undefined) {
@@ -284,7 +280,7 @@ const polygonAttributeName = computed({
   },
 });
 
-const polygonAttributeItem = computed({
+const polygonAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeItem(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined) {
@@ -295,7 +291,7 @@ const polygonAttributeItem = computed({
   },
 });
 
-const polygonAttributeRange = computed({
+const polygonAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeRange(modelId, surfaceId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -312,7 +308,7 @@ const polygonAttributeRange = computed({
   },
 });
 
-const polygonAttributeColorMap = computed({
+const polygonAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelSurfacesPolygonAttributeColorMap(modelId, surfaceId),
   set: async (newValue) => {
     if (surfaceId === undefined) {
diff --git a/app/components/Viewer/ObjectTree/Base/CommonTreeView.vue b/app/components/Viewer/ObjectTree/Base/CommonTreeView.vue
index 666100e7..83a9fc27 100644
--- a/app/components/Viewer/ObjectTree/Base/CommonTreeView.vue
+++ b/app/components/Viewer/ObjectTree/Base/CommonTreeView.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
+import { type DisplayItem, type EmitFn, useVirtualTree } from "@ogw_front/composables/virtual_tree";
 import StickyHeader from "@ogw_front/components/Viewer/ObjectTree/Base/StickyHeader.vue";
 import TreeRow from "@ogw_front/components/Viewer/ObjectTree/Base/TreeRow.vue";
 import { useTreeKeyboardNav } from "@ogw_front/composables/tree_keyboard_nav";
 import { useTreeScroll } from "@ogw_front/composables/tree_scroll";
-import { useVirtualTree } from "@ogw_front/composables/virtual_tree";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { DisplayItem, EmitFn } from "@ogw_front/composables/virtual_tree";
 
 // The useVirtualTree composable's own props type (VirtualTreeProps) isn't exported; this component intentionally stays generic over whatever item shape callers use (plain treeview groups, model component groups, ...), so it is extracted from the composable's signature instead of re-declared here.
 type UnwrapMaybeRefOrGetter<Source> = Source extends () => infer Result
@@ -35,7 +33,7 @@ const {
 
 const treeWrapper = ref<HTMLDivElement | undefined>(undefined);
 
-const emit = defineEmits<{
+interface Emits {
   "update:opened": [value: unknown[]];
   "update:selected": [value: unknown[]];
   "update:active": [value: unknown[]];
@@ -44,7 +42,9 @@ const emit = defineEmits<{
   "hover:enter": [payload: { item: DisplayItem }];
   "hover:leave": [payload: { item: DisplayItem }];
   contextmenu: [payload: { event: MouseEvent; item: DisplayItem["raw"] }];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const {
   actualItemProps,
@@ -76,57 +76,75 @@ const { virtualScrollRef, stickyHeader, handleScroll, scrollToIndex, getScrollIn
     actualItemProps,
   );
 
-const focusedIndex = ref(-1);
-const lastActiveIndex = ref(-1);
+const focusedIndex = ref<number>(-1);
+const lastActiveIndex = ref<number>(-1);
 
-function handleItemClick(
-  item: DisplayItem,
-  index: number | undefined,
-  event?: MouseEvent | KeyboardEvent,
-) {
+function applyRangeSelect(newActive: Set<unknown>, index: number): void {
+  const start = Math.min(lastActiveIndex.value, index);
+  const end = Math.max(lastActiveIndex.value, index);
+  for (let i = start; i <= end; i += 1) {
+    const rowItem = displayItems.value[i];
+    if (rowItem && rowItem.isLeaf) {
+      newActive.add(rowItem.raw[actualItemProps.value.value]);
+    }
+  }
+}
+
+function applyToggleActive(newActive: Set<unknown>, id: unknown, index: number | undefined): void {
+  if (newActive.has(id)) {
+    newActive.delete(id);
+  } else {
+    newActive.add(id);
+  }
   if (index !== undefined) {
-    focusedIndex.value = index;
+    lastActiveIndex.value = index;
   }
+}
 
-  if (event && (event.ctrlKey || event.metaKey || event.shiftKey)) {
-    const newActive = new Set(active);
-    const id = item.raw[actualItemProps.value.value];
+function handleMultiSelectClick(
+  item: DisplayItem,
+  index: number | undefined,
+  event: MouseEvent | KeyboardEvent,
+): void {
+  const newActive = new Set(active);
+  const id = item.raw[actualItemProps.value.value];
+  if (event.shiftKey && lastActiveIndex.value !== -1 && index !== undefined) {
+    applyRangeSelect(newActive, index);
+  } else {
+    applyToggleActive(newActive, id, index);
+  }
+  emit("update:active", [...newActive]);
+}
 
-    if (event.shiftKey && lastActiveIndex.value !== -1 && index !== undefined) {
-      const start = Math.min(lastActiveIndex.value, index);
-      const end = Math.max(lastActiveIndex.value, index);
-      for (let i = start; i <= end; i += 1) {
-        const rowItem = displayItems.value[i];
-        if (rowItem && rowItem.isLeaf) {
-          newActive.add(rowItem.raw[actualItemProps.value.value]);
-        }
-      }
-    } else {
-      if (newActive.has(id)) {
-        newActive.delete(id);
-      } else {
-        newActive.add(id);
-      }
-      if (index !== undefined) {
-        lastActiveIndex.value = index;
-      }
-    }
-    emit("update:active", [...newActive]);
+function handleNormalClick(item: DisplayItem, index: number | undefined): void {
+  if (!item.isLeaf) {
+    toggleOpen(item.raw);
     return;
   }
+  emit("update:active", [item.raw[actualItemProps.value.value]]);
+  if (index !== undefined) {
+    lastActiveIndex.value = index;
+  }
+  toggleSelect(item.raw);
+  emit("click:item", item.raw);
+}
 
-  // Normal click
-  if (item.isLeaf) {
-    const newActive = [item.raw[actualItemProps.value.value]];
-    emit("update:active", newActive);
-    if (index !== undefined) {
-      lastActiveIndex.value = index;
-    }
+function isMultiSelectEvent(event: MouseEvent | KeyboardEvent): void {
+  return event.ctrlKey || event.metaKey || event.shiftKey;
+}
 
-    toggleSelect(item.raw);
-    emit("click:item", item.raw);
+function handleItemClick(
+  item: DisplayItem,
+  index: number | undefined,
+  event?: MouseEvent | KeyboardEvent,
+): void {
+  if (index !== undefined) {
+    focusedIndex.value = index;
+  }
+  if (Boolean(event) && isMultiSelectEvent(event)) {
+    handleMultiSelectClick(item, index, event);
   } else {
-    toggleOpen(item.raw);
+    handleNormalClick(item, index);
   }
 }
 
diff --git a/app/components/Viewer/ObjectTree/Base/Controls.vue b/app/components/Viewer/ObjectTree/Base/Controls.vue
index 948bc4f7..1b2b9c81 100644
--- a/app/components/Viewer/ObjectTree/Base/Controls.vue
+++ b/app/components/Viewer/ObjectTree/Base/Controls.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import ActionButton from "@ogw_front/components/ActionButton.vue";
 import SearchBar from "@ogw_front/components/SearchBar.vue";
 
@@ -20,14 +18,16 @@ const {
   isCollapsed = false,
 } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   "update:search": [value: string];
   "toggle-sort": [];
   "collapse-all": [];
   "expand-all": [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
-const showSearch = ref(false);
+const showSearch = ref<boolean>(false);
 
 watch(
   () => showSearch.value,
diff --git a/app/components/Viewer/ObjectTree/Base/ItemLabel.vue b/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
index bddd06c5..4ce52c3d 100644
--- a/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
+++ b/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import { middleTruncate } from "@ogw_front/utils/string";
 import { useClipboard } from "@vueuse/core";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useResponsiveMiddleTruncate } from "@ogw_front/composables/responsive_middle_truncate";
-import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 
 const feedbackStore = useFeedbackStore();
 const { copy } = useClipboard();
@@ -17,11 +15,13 @@ interface Props {
 
 const { item, isLeaf } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   contextmenu: [event: MouseEvent];
   mouseenter: [];
   mouseleave: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const labelContainer = useTemplateRef("label-container");
 const { width: containerWidth } = useElementSize(labelContainer);
@@ -34,7 +34,7 @@ interface LabeledItem {
   children?: unknown[];
 }
 
-const actualItem = computed(() => (item.raw || item) as unknown as LabeledItem);
+const actualItem = computed<LabeledItem>(() => (item.raw || item) as unknown as LabeledItem);
 
 const TOOLTIP_NAME_MAX_LENGTH = 40;
 const TOOLTIP_NAME_START_CHARS = 10;
@@ -42,7 +42,7 @@ const TOOLTIP_NAME_END_CHARS = 8;
 
 const displayTitle = useResponsiveMiddleTruncate(() => actualItem.value.title, containerWidth);
 
-const tooltipTitle = computed(() =>
+const tooltipTitle = computed<string>(() =>
   middleTruncate(
     actualItem.value.title,
     TOOLTIP_NAME_MAX_LENGTH,
@@ -51,14 +51,14 @@ const tooltipTitle = computed(() =>
   ),
 );
 
-const tooltipDisabled = computed(() => {
+const tooltipDisabled = computed<boolean>(() => {
   if (isLeaf !== undefined) {
     return !isLeaf;
   }
   return actualItem.value.children && actualItem.value.children.length > 0;
 });
 
-async function copyToClipboard(text: string, label: string) {
+async function copyToClipboard(text: string, label: string): Promise<void> {
   await copy(text);
   feedbackStore.add_success(`${label} copied to clipboard`);
 }
diff --git a/app/components/Viewer/ObjectTree/Base/StickyHeader.vue b/app/components/Viewer/ObjectTree/Base/StickyHeader.vue
index 66365eda..8bc72b34 100644
--- a/app/components/Viewer/ObjectTree/Base/StickyHeader.vue
+++ b/app/components/Viewer/ObjectTree/Base/StickyHeader.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import TreeRow from "@ogw_front/components/Viewer/ObjectTree/Base/TreeRow.vue";
 import type {
   DisplayItem,
   ItemPropsConfig,
   SelectionConfig,
   TreeItem,
 } from "@ogw_front/composables/virtual_tree";
+import TreeRow from "@ogw_front/components/Viewer/ObjectTree/Base/TreeRow.vue";
 
 interface Props {
   item: DisplayItem;
@@ -19,10 +17,12 @@ interface Props {
 
 const { item, itemProps, selection, isSelected, getIndeterminate } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   "toggle-open": [item: TreeItem];
   "toggle-select": [item: TreeItem];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 </script>
 
 <template>
diff --git a/app/components/Viewer/ObjectTree/Base/TreeRow.vue b/app/components/Viewer/ObjectTree/Base/TreeRow.vue
index 8c57de12..a9cc4476 100644
--- a/app/components/Viewer/ObjectTree/Base/TreeRow.vue
+++ b/app/components/Viewer/ObjectTree/Base/TreeRow.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { useDataStore } from "@ogw_front/stores/data";
 import type {
   DisplayItem,
   ItemPropsConfig,
   SelectionConfig,
   TreeItem,
 } from "@ogw_front/composables/virtual_tree";
+import { useDataStore } from "@ogw_front/stores/data";
 
 const dataStore = useDataStore();
 
@@ -21,25 +19,27 @@ interface Props {
 
 const { item, itemProps, selection, isSelected, getIndeterminate } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   "toggle-open": [item: TreeItem];
   "toggle-select": [item: TreeItem];
   "hover-eye-enter": [item: unknown];
   "hover-eye-leave": [item: unknown];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const INDENT_STEP = 10;
 
-function triggerHorizonStackModal(rawItem: unknown) {
+function triggerHorizonStackModal(rawItem: unknown): void {
   globalThis.dispatchEvent(new CustomEvent("open-horizon-stack-modal", { detail: rawItem }));
 }
-const isHorizonStack = computed(() => item.raw.geode_object_type === "HorizonStack3D");
-const isViewable = computed(() => dataStore.isItemViewable(item.raw));
-const showEyeButton = computed(
+const isHorizonStack = computed<boolean>(() => item.raw.geode_object_type === "HorizonStack3D");
+const isViewable = computed<boolean>(() => dataStore.isItemViewable(item.raw));
+const showEyeButton = computed<boolean>(
   () => !isHorizonStack.value && item.raw.title !== "HorizonStack3D" && isViewable.value,
 );
 
-function handleRowClick(event: MouseEvent) {
+function handleRowClick(event: MouseEvent): void {
   if (isHorizonStack.value) {
     if (!item.isLeaf) {
       return;
diff --git a/app/components/Viewer/ObjectTree/Box.vue b/app/components/Viewer/ObjectTree/Box.vue
index e5b0fb5f..81bf7848 100644
--- a/app/components/Viewer/ObjectTree/Box.vue
+++ b/app/components/Viewer/ObjectTree/Box.vue
@@ -23,11 +23,13 @@ const {
   borderLeft = true,
 } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   close: [];
   dragstart: [event: DragEvent];
   "update:scrollTop": [value: number];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const scrollContainer = useTemplateRef("scroll-container");
 const treeviewBox = useTemplateRef("treeview-box");
@@ -37,14 +39,14 @@ const { adaptiveStyles } = useAdaptiveStyles(treeviewBox);
 let isApplyingScroll = false;
 let resizeObserver: ResizeObserver | undefined = undefined;
 
-function handleScroll(event: Event) {
+function handleScroll(event: Event): void {
   if (isApplyingScroll) {
     return;
   }
   emit("update:scrollTop", (event.target as HTMLElement).scrollTop);
 }
 
-function applyScrollTop(val: number) {
+function applyScrollTop(val: number): void {
   if (scrollContainer.value) {
     isApplyingScroll = true;
     scrollContainer.value.scrollTop = val;
diff --git a/app/components/Viewer/ObjectTree/Layout.vue b/app/components/Viewer/ObjectTree/Layout.vue
index 30357b16..4e1efc09 100644
--- a/app/components/Viewer/ObjectTree/Layout.vue
+++ b/app/components/Viewer/ObjectTree/Layout.vue
@@ -23,21 +23,26 @@ interface Props {
 const { containerWidth } = defineProps<Props>();
 
 const treeviewStore = useTreeviewStore();
-const emit = defineEmits<{
+
+interface Emits {
   "show-menu": [payload: Record<string, unknown>];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const activityBar = useTemplateRef("activity-bar");
 const { adaptiveStyles: activityBarAdaptiveStyles } = useAdaptiveStyles(activityBar);
 
-const maxWidth = computed(() => containerWidth * MAX_PANEL_WIDTH_RATIO);
+const maxWidth = computed<number>(() => containerWidth * MAX_PANEL_WIDTH_RATIO);
 
-const mainView = computed(() => treeviewStore.opened_views.find((view) => view.id === "main"));
-const additionalViews = computed(() =>
+const mainView = computed<TreeViewItem | undefined>(() =>
+  treeviewStore.opened_views.find((view) => view.id === "main"),
+);
+const additionalViews = computed<TreeViewItem[]>(() =>
   treeviewStore.opened_views.filter((view) => view.id !== "main"),
 );
 
-const totalWidth = computed(() => {
+const totalWidth = computed<string>(() => {
   const hasAdditional = additionalViews.value.length > 0;
   const hasMain = Boolean(mainView.value);
   const gap = hasAdditional && hasMain ? GAP_WIDTH : 0;
@@ -62,7 +67,7 @@ watch(
   { immediate: true },
 );
 
-watch([maxWidth, () => additionalViews.value.length], ([newMax]) => {
+watch([maxWidth, (): number => additionalViews.value.length], ([newMax]): void => {
   const hasAdditional = additionalViews.value.length > 0;
   const gap = hasAdditional ? GAP_WIDTH : 0;
   const total =
@@ -84,25 +89,25 @@ watch([maxWidth, () => additionalViews.value.length], ([newMax]) => {
   }
 });
 
-function onDragStart(index: number) {
+function onDragStart(index: number): void {
   draggedIndex.value = index;
 }
 
-function onDragOver(event: DragEvent) {
+function onDragOver(event: DragEvent): void {
   event.preventDefault();
 }
 
-function onDrop(targetIndex: number) {
+function onDrop(targetIndex: number): void {
   if (draggedIndex.value !== undefined && draggedIndex.value !== targetIndex) {
     treeviewStore.moveView(draggedIndex.value, targetIndex);
   }
   draggedIndex.value = undefined;
 }
 
-function onResizeStart(event: MouseEvent) {
+function onResizeStart(event: MouseEvent): void {
   const startWidth = treeviewStore.panelWidth;
   const startX = event.clientX;
-  function resize(move_event: MouseEvent) {
+  function resize(move_event: MouseEvent): void {
     const deltaX = move_event.clientX - startX;
     let newWidth = startWidth + deltaX;
     const hasAdditional = additionalViews.value.length > 0;
@@ -121,7 +126,7 @@ function onResizeStart(event: MouseEvent) {
     treeviewStore.setPanelWidth(Math.max(WIDTH_MIN, newWidth));
     document.body.style.userSelect = "none";
   }
-  function stopResize() {
+  function stopResize(): void {
     document.removeEventListener("mousemove", resize);
     document.removeEventListener("mouseup", stopResize);
     document.body.style.userSelect = "";
@@ -130,10 +135,10 @@ function onResizeStart(event: MouseEvent) {
   document.addEventListener("mouseup", stopResize);
 }
 
-function onAdditionalResizeStart(event: MouseEvent) {
+function onAdditionalResizeStart(event: MouseEvent): void {
   const startWidth = treeviewStore.additionalPanelWidth;
   const startX = event.clientX;
-  function resize(move_event: MouseEvent) {
+  function resize(move_event: MouseEvent): void {
     const deltaX = move_event.clientX - startX;
     const newWidth = startWidth + deltaX;
     const currentTotalWidth = treeviewStore.panelWidth + newWidth + GAP_WIDTH;
@@ -148,7 +153,7 @@ function onAdditionalResizeStart(event: MouseEvent) {
     treeviewStore.setAdditionalPanelWidth(Math.max(WIDTH_MIN, newWidth));
     document.body.style.userSelect = "none";
   }
-  function stopResize() {
+  function stopResize(): void {
     document.removeEventListener("mousemove", resize);
     document.removeEventListener("mouseup", stopResize);
     document.body.style.userSelect = "";
@@ -157,13 +162,13 @@ function onAdditionalResizeStart(event: MouseEvent) {
   document.addEventListener("mouseup", stopResize);
 }
 
-function onVerticalResizeStart(event: MouseEvent, index: number) {
+function onVerticalResizeStart(event: MouseEvent, index: number): void {
   const startY = event.clientY;
   const startHeight1 = rowHeights.value[index] ?? 0;
   const startHeight2 = rowHeights.value[index + 1] ?? 0;
   const containerHeight = (event.currentTarget as HTMLElement).parentElement?.offsetHeight ?? 0;
 
-  function resize(move_event: MouseEvent) {
+  function resize(move_event: MouseEvent): void {
     const deltaY = move_event.clientY - startY;
     const deltaPercent = (deltaY / containerHeight) * PERCENT_100;
     const minHeightPercent = (HEIGHT_MIN / containerHeight) * PERCENT_100;
@@ -188,7 +193,7 @@ function onVerticalResizeStart(event: MouseEvent, index: number) {
     document.body.style.cursor = "ns-resize";
   }
 
-  function stopResize() {
+  function stopResize(): void {
     document.removeEventListener("mousemove", resize);
     document.removeEventListener("mouseup", stopResize);
     document.body.style.userSelect = "";
diff --git a/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue b/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
index 796ff65e..ef8f1ad2 100644
--- a/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
+++ b/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import CommonTreeView from "@ogw_front/components/Viewer/ObjectTree/Base/CommonTreeView.vue";
+import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import ObjectTreeControls from "@ogw_front/components/Viewer/ObjectTree/Base/Controls.vue";
 import ObjectTreeItemLabel from "@ogw_front/components/Viewer/ObjectTree/Base/ItemLabel.vue";
-import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import { compareSelections } from "@ogw_front/utils/treeview";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -19,9 +17,11 @@ const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 const { onHoverEnter, onHoverLeave } = useHoverhighlight();
 
-const emit = defineEmits<{
+interface Emits {
   "show-menu": [payload: { event: MouseEvent; itemId: string }];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface TreeGroupItem {
   raw?: TreeGroupItem;
@@ -32,8 +32,8 @@ interface TreeGroupItem {
   children?: TreeGroupItem[];
 }
 
-const mainView = computed(() => treeviewStore.opened_views[0]);
-const opened = computed({
+const mainView = computed<TreeGroupItem>(() => treeviewStore.opened_views[0]);
+const opened = computed<string[]>({
   get: () => mainView.value?.opened || [],
   set: (val) => treeviewStore.setOpened(mainView.value?.id ?? "", val),
 });
@@ -49,11 +49,11 @@ const {
   applySearchFilter,
 } = useTreeFilter(() => treeviewStore.items, { recursiveSort: true });
 
-function onUpdateSelection(val: string[]) {
+function onUpdateSelection(val: string[]): void {
   treeviewStore.selection = applySearchFilter(val, treeviewStore.selection) as string[];
 }
 
-const visibleSelection = computed(() => applySearchFilter(treeviewStore.selection, []));
+const visibleSelection = computed<string[]>(() => applySearchFilter(treeviewStore.selection, []));
 
 watch(
   () => treeviewStore.selection,
@@ -82,7 +82,7 @@ watch(
   },
 );
 
-function isModel(item: TreeGroupItem) {
+function isModel(item: TreeGroupItem): boolean {
   const actualItem = item.raw || item;
   return (
     actualItem.viewer_type === "model" ||
@@ -121,7 +121,7 @@ function handleHoverEnter({
 }: {
   item: TreeGroupItem;
   immediate?: boolean;
-}) {
+}): void {
   const actualItem = item.raw || item;
 
   if (!actualItem.viewer_type) {
@@ -138,7 +138,7 @@ function handleHoverEnter({
   );
 }
 
-function handleHoverLeave({ item }: { item: TreeGroupItem }) {
+function handleHoverLeave({ item }: { item: TreeGroupItem }): void {
   const actualItem = item.raw || item;
   if (!actualItem.viewer_type) {
     return;
@@ -146,9 +146,9 @@ function handleHoverLeave({ item }: { item: TreeGroupItem }) {
   onHoverLeave(actualItem.id);
 }
 
-function expandAll() {
+function expandAll(): void {
   const allIds: string[] = [];
-  function traverse(itemsList: TreeGroupItem[]) {
+  function traverse(itemsList: TreeGroupItem[]): void {
     for (const item of itemsList) {
       if (item.children && item.children.length > 0) {
         allIds.push(item.id);
diff --git a/app/components/Viewer/ObjectTree/Views/ModelCollections.vue b/app/components/Viewer/ObjectTree/Views/ModelCollections.vue
index bb6cd746..9be1607b 100644
--- a/app/components/Viewer/ObjectTree/Views/ModelCollections.vue
+++ b/app/components/Viewer/ObjectTree/Views/ModelCollections.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { sortAndFormatItems, useTreeFilter } from "@ogw_front/composables/tree_filter";
 import CommonTreeView from "@ogw_front/components/Viewer/ObjectTree/Base/CommonTreeView.vue";
+import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import FetchingData from "@ogw_front/components/FetchingData.vue";
 import ObjectTreeControls from "@ogw_front/components/Viewer/ObjectTree/Base/Controls.vue";
 import ObjectTreeItemLabel from "@ogw_front/components/Viewer/ObjectTree/Base/ItemLabel.vue";
-import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import { useHoverhighlight } from "@ogw_front/composables/hover_highlight";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useModelCollections } from "@ogw_front/composables/model_collections";
@@ -31,7 +29,8 @@ interface CollectionTreeItem {
 
 const { onHoverEnter, onHoverLeave } = useHoverhighlight();
 const hybridViewerStore = useHybridViewerStore();
-const emit = defineEmits<{
+
+interface Emits {
   "show-menu": [
     payload: {
       event: unknown;
@@ -41,7 +40,9 @@ const emit = defineEmits<{
       modelComponentType: string | undefined;
     },
   ];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const treeviewStore = useTreeviewStore();
 const {
@@ -52,11 +53,11 @@ const {
   updateVisibility,
 } = useModelCollections(id);
 
-const currentView = computed(() =>
+const currentView = computed<TreeViewItem | undefined>(() =>
   treeviewStore.opened_views.find((view) => view.id === actualViewId),
 );
 
-const opened = computed({
+const opened = computed<string[]>({
   get: () => currentView.value?.opened || [],
   set: (val) => treeviewStore.setOpened(actualViewId, val),
 });
@@ -72,12 +73,12 @@ const {
   applySearchFilter,
 } = useTreeFilter(localCategories);
 
-function onUpdateSelection(newSelection: string[]) {
+function onUpdateSelection(newSelection: string[]): void {
   const finalSelection = applySearchFilter(newSelection, visibleComponents.value);
   updateVisibility(finalSelection as string[]);
 }
 
-const visibleSelection = computed(() => applySearchFilter(visibleComponents.value, []));
+const visibleSelection = computed<string[]>(() => applySearchFilter(visibleComponents.value, []));
 
 const itemsForTreeView = computed<CollectionTreeItem[]>(() => {
   if (search.value && componentsCache.value) {
@@ -115,7 +116,7 @@ const itemsForTreeView = computed<CollectionTreeItem[]>(() => {
   return result;
 });
 
-function showContextMenu(event: unknown, item: CollectionTreeItem) {
+function showContextMenu(event: unknown, item: CollectionTreeItem): void {
   const actualItem = item.raw || item;
   emit("show-menu", {
     event,
@@ -142,7 +143,7 @@ function handleHoverEnter({
 }: {
   item: CollectionTreeItem;
   immediate?: boolean;
-}) {
+}): void {
   const actualItem = item.raw || item;
 
   if (!actualItem.category && (!actualItem.children || actualItem.children.length === 0)) {
@@ -154,13 +155,13 @@ function handleHoverEnter({
   onHoverEnter(id, () => viewerIdsToHover, "model", immediate);
 }
 
-function handleHoverLeave() {
+function handleHoverLeave(): void {
   onHoverLeave(id);
 }
 
-function expandAll() {
+function expandAll(): void {
   const allIds: string[] = [];
-  function traverse(itemsList: CollectionTreeItem[]) {
+  function traverse(itemsList: CollectionTreeItem[]): void {
     for (const item of itemsList) {
       if (item.children && item.children.length > 0) {
         allIds.push(item.id);
@@ -172,12 +173,11 @@ function expandAll() {
   opened.value = allIds;
 }
 
-function getLeafViewerIds(item: CollectionTreeItem) {
+function getLeafViewerIds(item: CollectionTreeItem): number[] {
   const actualItem = item.raw || item;
   return extractIds(actualItem);
 }
 
-// The focusCameraOnObject composable's block_ids parameter is declared as string[], but this view (like the sibling ModelComponents view) has always focused the camera using the numeric viewer/actor ids collected by extractIds; that pre-dates this typing pass, so the ids are passed through as-is (no Number/String conversion) rather than changed here.
 function getLeafViewerIdsForFocus(item: CollectionTreeItem): string[] {
   return getLeafViewerIds(item) as unknown as string[];
 }
diff --git a/app/components/Viewer/ObjectTree/Views/ModelComponents.vue b/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
index 9fdd093d..86e96891 100644
--- a/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
+++ b/app/components/Viewer/ObjectTree/Views/ModelComponents.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { sortAndFormatItems, useTreeFilter } from "@ogw_front/composables/tree_filter";
 import CommonTreeView from "@ogw_front/components/Viewer/ObjectTree/Base/CommonTreeView.vue";
+import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import FetchingData from "@ogw_front/components/FetchingData.vue";
 import ObjectTreeControls from "@ogw_front/components/Viewer/ObjectTree/Base/Controls.vue";
 import ObjectTreeItemLabel from "@ogw_front/components/Viewer/ObjectTree/Base/ItemLabel.vue";
-import type { DisplayItem } from "@ogw_front/composables/virtual_tree";
 import { useHoverhighlight } from "@ogw_front/composables/hover_highlight";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useModelComponents } from "@ogw_front/composables/model_components";
@@ -31,7 +29,8 @@ interface TreeViewItem {
 
 const { onHoverEnter, onHoverLeave } = useHoverhighlight();
 const hybridViewerStore = useHybridViewerStore();
-const emit = defineEmits<{
+
+interface Emits {
   "show-menu": [
     payload: {
       event: unknown;
@@ -42,7 +41,9 @@ const emit = defineEmits<{
       targetComponentIds?: string[];
     },
   ];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const treeviewStore = useTreeviewStore();
 const {
@@ -53,11 +54,11 @@ const {
   updateVisibility,
 } = useModelComponents(id);
 
-const currentView = computed(() =>
+const currentView = computed<TreeViewItem | undefined>(() =>
   treeviewStore.opened_views.find((view) => view.id === actualViewId),
 );
 
-const opened = computed({
+const opened = computed<string[]>({
   get: () => currentView.value?.opened || [],
   set: (val) => treeviewStore.setOpened(actualViewId, val),
 });
@@ -73,12 +74,12 @@ const {
   applySearchFilter,
 } = useTreeFilter(localCategories);
 
-function onUpdateSelection(newSelection: string[]) {
+function onUpdateSelection(newSelection: string[]): void {
   const finalSelection = applySearchFilter(newSelection, visibleComponents.value);
   updateVisibility(finalSelection as string[]);
 }
 
-const visibleSelection = computed(() => applySearchFilter(visibleComponents.value, []));
+const visibleSelection = computed<string[]>(() => applySearchFilter(visibleComponents.value, []));
 
 const itemsForTreeView = computed<TreeViewItem[]>(() => {
   if (search.value && componentsCache.value) {
@@ -116,7 +117,7 @@ const itemsForTreeView = computed<TreeViewItem[]>(() => {
   return result;
 });
 
-function showContextMenu(event: unknown, item: TreeViewItem) {
+function showContextMenu(event: unknown, item: TreeViewItem): void {
   const actualItem = item.raw || item;
   const typeId = actualItem.category || actualItem.id;
   const typeItem = itemsForTreeView.value.find((type) => type.id === typeId);
@@ -139,7 +140,7 @@ function handleHoverEnter({
 }: {
   item: TreeViewItem;
   immediate?: boolean;
-}) {
+}): void {
   const actualItem = item.raw || item;
 
   if (!actualItem.category && (!actualItem.children || actualItem.children.length === 0)) {
@@ -157,7 +158,7 @@ function handleHoverEnter({
   );
 }
 
-function handleHoverLeave() {
+function handleHoverLeave(): void {
   onHoverLeave(id);
 }
 
@@ -174,9 +175,9 @@ function getFocusBlockIds(item: TreeViewItem): string[] {
   return ids as unknown as string[];
 }
 
-function expandAll() {
+function expandAll(): void {
   const allIds: string[] = [];
-  function traverse(itemsList: TreeViewItem[]) {
+  function traverse(itemsList: TreeViewItem[]): void {
     for (const item of itemsList) {
       if (item.children && item.children.length > 0) {
         allIds.push(item.id);
diff --git a/app/components/Viewer/Options/AttributeColorBar.vue b/app/components/Viewer/Options/AttributeColorBar.vue
index 86aa8559..caf4c07c 100644
--- a/app/components/Viewer/Options/AttributeColorBar.vue
+++ b/app/components/Viewer/Options/AttributeColorBar.vue
@@ -2,9 +2,11 @@
 import AttributeRangeSelector from "./AttributeRangeSelector.vue";
 import ColorMapPicker from "./ColorMapPicker.vue";
 
-const emit = defineEmits<{
+interface Emits {
   reset: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const minimum = defineModel<number>("minimum");
 const maximum = defineModel<number>("maximum");
diff --git a/app/components/Viewer/Options/AttributeRangeSelector.vue b/app/components/Viewer/Options/AttributeRangeSelector.vue
index fbfc7a40..1811f531 100644
--- a/app/components/Viewer/Options/AttributeRangeSelector.vue
+++ b/app/components/Viewer/Options/AttributeRangeSelector.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-const emit = defineEmits<{
+interface Emits {
   reset: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const minimum = defineModel<number>("minimum");
 const maximum = defineModel<number>("maximum");
diff --git a/app/components/Viewer/Options/AttributeSelector.vue b/app/components/Viewer/Options/AttributeSelector.vue
index 5681457e..b082ed7f 100644
--- a/app/components/Viewer/Options/AttributeSelector.vue
+++ b/app/components/Viewer/Options/AttributeSelector.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
+import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 import ViewerOptionsAttributeColorBar from "@ogw_front/components/Viewer/Options/AttributeColorBar.vue";
 import ViewerOptionsColorPicker from "@ogw_front/components/Viewer/Options/ColorPicker.vue";
 import { getAttributeRange } from "@ogw_front/utils/attributes";
 import { useBackStore } from "@ogw_front/stores/back";
-import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 
 const backStore = useBackStore();
 
@@ -33,10 +31,10 @@ interface AttributeInfo {
 
 const attributes = ref<AttributeInfo[]>([]);
 
-const currentAttribute = computed(() =>
+const currentAttribute = computed<AttributeInfo | undefined>(() =>
   attributes.value.find((attr) => attr.attribute_name === attributeName.value),
 );
-const cssNoDataColor = computed(() => {
+const cssNoDataColor = computed<string>(() => {
   const { red, green, blue, alpha } = attributeNoDataColor.value ?? DEFAULT_NO_DATA_COLOR;
   return `rgba(${red}, ${green}, ${blue}, ${alpha})`;
 });
@@ -77,7 +75,7 @@ const rangeMax = computed<number | undefined>({
   },
 });
 
-const componentItems = computed(() => {
+const componentItems = computed<{ title: string; value: number }[]>(() => {
   if (!currentAttribute.value) {
     return [];
   }
@@ -87,7 +85,7 @@ const componentItems = computed(() => {
   }));
 });
 
-function resetRange() {
+function resetRange(): void {
   if (currentAttribute.value) {
     const comp = attributeItem.value ?? 0;
     // GetAttributeRange's parameter type (AttributeRangeSource) isn't exported;
@@ -101,11 +99,11 @@ function resetRange() {
   }
 }
 
-function hasSelectedComponent(components: unknown) {
+function hasSelectedComponent(components: unknown): boolean {
   return Array.isArray(components) && components.length > 0;
 }
 
-function getAttributes() {
+function getAttributes(): void {
   const schemaProperties = schema.properties as Record<string, unknown> | undefined;
   const requiresComponent = schemaProperties?.component_ids !== undefined;
   if (requiresComponent && !hasSelectedComponent(componentIds)) {
diff --git a/app/components/Viewer/Options/ColorMapList.vue b/app/components/Viewer/Options/ColorMapList.vue
index 7d86fed0..3a175aee 100644
--- a/app/components/Viewer/Options/ColorMapList.vue
+++ b/app/components/Viewer/Options/ColorMapList.vue
@@ -17,29 +17,31 @@ interface Props {
 
 const { presets, selectedPresetName = "" } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   select: [preset: ColorMapPreset];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface CanvasRefEntry {
   element: HTMLCanvasElement;
   presetName: string;
 }
 
-const filterText = ref("");
-const canvasRefs = ref<Record<string, CanvasRefEntry>>({});
-const loading = ref(true);
-const renderJobId = ref(0);
+const filterText = ref<string>("");
+const canvasRefs = ref<Map<string, CanvasRefEntry>>(new Map());
+const loading = ref<boolean>(true);
+const renderJobId = ref<number>(0);
 const openedGroups = ref<string[]>([]);
 
-function setCanvasRef(presetName: string, element: Element | null, id: string) {
+function setCanvasRef(presetName: string, element: Element | null, id: string): void {
   if (element) {
-    canvasRefs.value[id] = {
+    canvasRefs.value.set(id, {
       element: element as HTMLCanvasElement,
       presetName,
-    };
+    });
   } else {
-    delete canvasRefs.value[id];
+    canvasRefs.value.delete(id);
   }
 }
 
@@ -74,7 +76,7 @@ watch(filterText, (newFilterText) => {
   }
 });
 
-function processChunk(entries: [string, CanvasRefEntry][], index: number, jobId: number) {
+function processChunk(entries: [string, CanvasRefEntry][], index: number, jobId: number): void {
   if (jobId !== renderJobId.value || index >= entries.length) {
     if (jobId === renderJobId.value) {
       loading.value = false;
@@ -95,13 +97,13 @@ function processChunk(entries: [string, CanvasRefEntry][], index: number, jobId:
   setTimeout(() => processChunk(entries, end, jobId), ZERO);
 }
 
-function drawAllCanvases() {
+function drawAllCanvases(): void {
   renderJobId.value += 1;
   const jobId = renderJobId.value;
   loading.value = true;
   nextTick(() => {
     const WAIT_MS = 50;
-    setTimeout(() => processChunk(Object.entries(canvasRefs.value), 0, jobId), WAIT_MS);
+    setTimeout(() => processChunk([...canvasRefs.value.entries()], 0, jobId), WAIT_MS);
   });
 }
 
diff --git a/app/components/Viewer/Options/ColorMapPicker.vue b/app/components/Viewer/Options/ColorMapPicker.vue
index 55aa1c35..aaf73b62 100644
--- a/app/components/Viewer/Options/ColorMapPicker.vue
+++ b/app/components/Viewer/Options/ColorMapPicker.vue
@@ -14,22 +14,22 @@ const selectedPresetName = defineModel<string>("selectedPresetName", {
   default: "batlow",
 });
 
-const menuOpen = ref(false);
+const menuOpen = ref<boolean>(false);
 const lutCanvas = ref<HTMLCanvasElement | undefined>(undefined);
 
 const presets = computed(() => getPresetsWithCurrentAtTop(selectedPresetName.value));
 
-function drawLutCanvas() {
+function drawLutCanvas(): void {
   drawCanvasForPreset(selectedPresetName.value, lutCanvas.value);
 }
 
-function onSelectPreset(preset: { Name: string }) {
+function onSelectPreset(preset: { Name: string }): void {
   selectedPresetName.value = preset.Name;
   menuOpen.value = false;
 }
 
 onMounted(() => nextTick(drawLutCanvas));
-watch([lutCanvas, selectedPresetName, () => min, () => max], drawLutCanvas);
+watch([lutCanvas, selectedPresetName, (): number => min, (): number => max], drawLutCanvas);
 </script>
 
 <template>
diff --git a/app/components/Viewer/Options/ColoringTypeSelector.vue b/app/components/Viewer/Options/ColoringTypeSelector.vue
index f092a436..618178fe 100644
--- a/app/components/Viewer/Options/ColoringTypeSelector.vue
+++ b/app/components/Viewer/Options/ColoringTypeSelector.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsAttributeSelector from "@ogw_front/components/Viewer/Options/AttributeSelector.vue";
 import ViewerOptionsColorPicker from "@ogw_front/components/Viewer/Options/ColorPicker.vue";
 import ViewerOptionsTexturesSelector from "@ogw_front/components/Viewer/Options/TexturesSelector.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Texture {
   id: string;
@@ -88,37 +86,39 @@ const polygonSchema = schemas.polygon || back_schemas.opengeodeweb_back.polygon_
 const polyhedronSchema =
   schemas.polyhedron || back_schemas.opengeodeweb_back.polyhedron_attribute_names;
 
-function isAvailable(key: string) {
+function isAvailable(key: string): boolean {
   if (capabilities[key] && capabilities[key].available === false) {
     return false;
   }
   return true;
 }
 
-function hasColorMap(key: string) {
+function hasColorMap(key: string): boolean {
   if (capabilities[key] && capabilities[key].hasColorMap === false) {
     return false;
   }
   return true;
 }
 
-const has_color = computed(() => color.value !== undefined && isAvailable("color"));
-const has_textures = computed(() => textures.value !== undefined && isAvailable("textures"));
-const has_vertex = computed(
+const has_color = computed<boolean>(() => color.value !== undefined && isAvailable("color"));
+const has_textures = computed<boolean>(
+  () => textures.value !== undefined && isAvailable("textures"),
+);
+const has_vertex = computed<boolean>(
   () =>
     vertex_attribute_range.value !== undefined && isAvailable("vertex") && hasColorMap("vertex"),
 );
-const has_edge = computed(
+const has_edge = computed<boolean>(
   () => edge_attribute_range.value !== undefined && isAvailable("edge") && hasColorMap("edge"),
 );
-const has_cells = computed(
+const has_cells = computed<boolean>(
   () => cell_attribute_range.value !== undefined && isAvailable("cell") && hasColorMap("cell"),
 );
-const has_polygons = computed(
+const has_polygons = computed<boolean>(
   () =>
     polygon_attribute_range.value !== undefined && isAvailable("polygon") && hasColorMap("polygon"),
 );
-const has_polyhedra = computed(
+const has_polyhedra = computed<boolean>(
   () =>
     polyhedron_attribute_range.value !== undefined &&
     isAvailable("polyhedron") &&
@@ -136,7 +136,7 @@ const polyhedron_dict = {
   name: "Polyhedron attribute",
   value: "polyhedron",
 };
-const coloring_styles = computed(() => {
+const coloring_styles = computed<{ labels: string[]; values: string[] }>(() => {
   const array = [];
   if (has_color.value) {
     array.push(color_dict);
@@ -169,9 +169,9 @@ const coloring_styles = computed(() => {
   return { labels, values };
 });
 
-const coloring_style_label = ref("");
+const coloring_style_label = ref<string>("");
 
-const active_key = computed(() => {
+const active_key = computed<string | undefined>(() => {
   const index = coloring_styles.value.labels.indexOf(coloring_style_label.value);
   return index === -1 ? coloring_style_key.value : coloring_styles.value.values[index];
 });
diff --git a/app/components/Viewer/Options/ColormapQuickPicker.vue b/app/components/Viewer/Options/ColormapQuickPicker.vue
index 1dc5f8d8..81439003 100644
--- a/app/components/Viewer/Options/ColormapQuickPicker.vue
+++ b/app/components/Viewer/Options/ColormapQuickPicker.vue
@@ -15,27 +15,29 @@ const { dataId = undefined, x, y } = defineProps<Props>();
 
 const show = defineModel<boolean>("show", { default: false });
 
-const dataIdRef = computed(() => dataId);
+const dataIdRef = computed<string>(() => dataId);
 const { currentColormap, currentRange, applyGlobalColormap, resetGlobalRange } =
   useGlobalAttributeStyle(dataIdRef);
 
-const minimum = computed({
+const minimum = computed<number>({
   get: () => currentRange.value[0],
   set: (val) => {
     currentRange.value = [val, currentRange.value[1]];
   },
 });
 
-const maximum = computed({
+const maximum = computed<number>({
   get: () => currentRange.value[1],
   set: (val) => {
     currentRange.value = [currentRange.value[0], val];
   },
 });
 
-const quickColormapPresets = computed(() => getPresetsWithCurrentAtTop(currentColormap.value));
+const quickColormapPresets = computed<{ Name: string }[]>(() =>
+  getPresetsWithCurrentAtTop(currentColormap.value),
+);
 
-async function onQuickColormapSelect(preset: { Name: string }) {
+async function onQuickColormapSelect(preset: { Name: string }): Promise<void> {
   await applyGlobalColormap(preset.Name);
 }
 </script>
diff --git a/app/components/Viewer/Options/OptionsSection.vue b/app/components/Viewer/Options/OptionsSection.vue
index 8af29cf4..e18d3848 100644
--- a/app/components/Viewer/Options/OptionsSection.vue
+++ b/app/components/Viewer/Options/OptionsSection.vue
@@ -5,7 +5,7 @@ interface Props {
 
 const { title } = defineProps<Props>();
 
-const isCollapsed = ref(false);
+const isCollapsed = ref<boolean>(false);
 </script>
 
 <template>
diff --git a/app/components/Viewer/Options/TextureItem.vue b/app/components/Viewer/Options/TextureItem.vue
index 35059f75..2d6c9bf1 100644
--- a/app/components/Viewer/Options/TextureItem.vue
+++ b/app/components/Viewer/Options/TextureItem.vue
@@ -6,9 +6,11 @@ import { useBackStore } from "@ogw_front/stores/back";
 // Mirrors FileUploader's own (unexported) UploadFile type.
 type UploadFile = File & { isConfigured?: boolean; displayName?: string };
 
-const emit = defineEmits<{
+interface Emits {
   update_value: [payload: { key: "texture_name" | "id"; value: string }];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 interface Props {
   id: string;
@@ -18,8 +20,8 @@ interface Props {
 
 const { id, textureId: propTextureId, textureName: propTextureName } = defineProps<Props>();
 
-const textureName = ref(propTextureName);
-const textureId = ref(propTextureId);
+const textureName = ref<string>(propTextureName);
+const textureId = ref<string>(propTextureId);
 
 watch(
   () => propTextureName,
@@ -38,7 +40,7 @@ watch(
 const textureCoordinates = ref<string[]>([]);
 const backStore = useBackStore();
 
-function getTextureCoordinates() {
+function getTextureCoordinates(): void {
   const schema = back_schemas.opengeodeweb_back.texture_coordinates;
   const params = { id };
   backStore.request(
@@ -57,7 +59,7 @@ onMounted(() => {
   getTextureCoordinates();
 });
 
-async function files_uploaded_event(value: UploadFile[]) {
+async function files_uploaded_event(value: UploadFile[]): Promise<void> {
   if (value.length > 0 && value[0]) {
     const schema = back_schemas.opengeodeweb_back.save_viewable_file;
     const params = {
diff --git a/app/components/Viewer/Options/TexturesSelector.vue b/app/components/Viewer/Options/TexturesSelector.vue
index 86bd6f2b..c5ccf1f1 100644
--- a/app/components/Viewer/Options/TexturesSelector.vue
+++ b/app/components/Viewer/Options/TexturesSelector.vue
@@ -24,7 +24,7 @@ onMounted(() => {
   }
 });
 
-function update_value_event($event: { key: keyof Texture; value: string }, index: number) {
+function update_value_event($event: { key: keyof Texture; value: string }, index: number): void {
   const texture = internal_textures.value[index];
   if (!texture) {
     return;
diff --git a/app/components/Viewer/OverlappingObjectsPicker.vue b/app/components/Viewer/OverlappingObjectsPicker.vue
index c29305aa..2e0f56ed 100644
--- a/app/components/Viewer/OverlappingObjectsPicker.vue
+++ b/app/components/Viewer/OverlappingObjectsPicker.vue
@@ -1,14 +1,11 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import GlassCard from "@ogw_front/components/GlassCard.vue";
 import { formatListId } from "@ogw_front/utils/name_cleaner";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
 
-// Mirrors the use_overlapping_picker composable's (unexported) ProposedItem type.
 interface IntermediateItem {
   id: string;
-  viewer_id: number;
+  viewer_id: number | undefined;
   name: string;
   viewer_type: string | undefined;
   geode_object_type: string | undefined;
@@ -17,21 +14,23 @@ interface IntermediateItem {
 interface Props {
   displayIntermediate: boolean;
   intermediateItems: IntermediateItem[];
-  menuStyle: Record<string, any>;
+  menuStyle: Record<string, unknown>;
 }
 
 const { displayIntermediate, intermediateItems, menuStyle } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   select: [item: IntermediateItem];
   "update:displayIntermediate": [val: boolean];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
-function selectItem(item: IntermediateItem) {
+function selectItem(item: IntermediateItem): void {
   emit("select", item);
 }
 
-function handleUpdate(val: boolean) {
+function handleUpdate(val: boolean): void {
   emit("update:displayIntermediate", val);
 }
 </script>
diff --git a/app/components/Viewer/PointSet/SpecificPointsOptions.vue b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
index 58445874..6285c9b1 100644
--- a/app/components/Viewer/PointSet/SpecificPointsOptions.vue
+++ b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
@@ -1,19 +1,15 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsSizeSlider from "@ogw_front/components/Viewer/Options/Sliders/Size.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
diff --git a/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue b/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
index 609b54b4..136fb248 100644
--- a/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
+++ b/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import SolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
+import SolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -27,7 +23,7 @@ const { itemProps, tooltip = "Polyhedra options" } = defineProps<Props>();
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshPolyhedraVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -36,7 +32,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshPolyhedraActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -54,7 +50,7 @@ const color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -66,7 +62,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -75,7 +71,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -90,7 +86,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.meshPolyhedraVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -109,7 +105,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_name = computed({
+const polyhedron_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -121,7 +117,7 @@ const polyhedron_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_item = computed({
+const polyhedron_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -130,7 +126,7 @@ const polyhedron_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_range = computed({
+const polyhedron_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -145,7 +141,7 @@ const polyhedron_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polyhedron_attribute_color_map = computed({
+const polyhedron_attribute_color_map = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.meshPolyhedraPolyhedronAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Surface/PolygonsOptions.vue b/app/components/Viewer/Surface/PolygonsOptions.vue
index b747804b..9562af27 100644
--- a/app/components/Viewer/Surface/PolygonsOptions.vue
+++ b/app/components/Viewer/Surface/PolygonsOptions.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import PolygonalSurfacePolygons from "@ogw_front/assets/viewer_svgs/surface_triangles.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import PolygonalSurfacePolygons from "@ogw_front/assets/viewer_svgs/surface_triangles.svg";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
@@ -32,7 +28,7 @@ const { itemProps, tooltip = "Polygons options" } = defineProps<Props>();
 
 const id = toRef(() => itemProps.id);
 
-const visibility = computed({
+const visibility = computed<boolean>({
   get: () => dataStyleStore.meshPolygonsVisibility(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -41,7 +37,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const coloring_style_key = computed({
+const coloring_style_key = computed<string>({
   get: () => dataStyleStore.meshPolygonsActiveColoring(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -68,7 +64,7 @@ const textures = computed<Texture[] | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_name = computed({
+const vertex_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -80,7 +76,7 @@ const vertex_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_item = computed({
+const vertex_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -89,7 +85,7 @@ const vertex_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_range = computed({
+const vertex_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -104,7 +100,7 @@ const vertex_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const vertex_attribute_color_map = computed({
+const vertex_attribute_color_map = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.meshPolygonsVertexAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -123,7 +119,7 @@ const vertex_attribute_no_data_color = computed<RGBAColor | undefined>({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_name = computed({
+const polygon_attribute_name = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeName(id.value),
   set: async (newValue) => {
     if (newValue === undefined) {
@@ -135,7 +131,7 @@ const polygon_attribute_name = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_item = computed({
+const polygon_attribute_item = computed<string | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeItem(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
@@ -144,7 +140,7 @@ const polygon_attribute_item = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_range = computed({
+const polygon_attribute_range = computed<[number, number] | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeRange(id.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -159,7 +155,7 @@ const polygon_attribute_range = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const polygon_attribute_color_map = computed({
+const polygon_attribute_color_map = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.meshPolygonsPolygonAttributeColorMap(id.value),
   set: async (newValue) => {
     await applyBatchStyle(id.value, (targetId: string) =>
diff --git a/app/components/Viewer/Ui.vue b/app/components/Viewer/Ui.vue
index 0dd4e957..db716352 100644
--- a/app/components/Viewer/Ui.vue
+++ b/app/components/Viewer/Ui.vue
@@ -23,7 +23,7 @@ const menuStore = useMenuStore();
 const viewerStore = useViewerStore();
 const hybridViewerStore = useHybridViewerStore();
 
-function stopHoverHighlight() {
+function stopHoverHighlight(): void {
   hybridViewerStore.is_hover_highlight = false;
   hybridViewerStore.clearHoverHighlight();
 }
@@ -57,7 +57,7 @@ const {
   get_viewer_id: trigger_picker,
 } = useOverlappingPicker();
 
-function get_viewer_id(x: number, y: number) {
+function get_viewer_id(x: number, y: number): string {
   const instance = getCurrentInstance();
   const containerRect = instance?.proxy?.$el
     ?.closest?.('[data-testid="hybridViewer"]')
diff --git a/app/components/Wrapper.vue b/app/components/Wrapper.vue
index b25d8994..57c8e2cd 100644
--- a/app/components/Wrapper.vue
+++ b/app/components/Wrapper.vue
@@ -1,13 +1,10 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 import Launcher from "@ogw_front/components/Launcher.vue";
 import PackagesVersions from "@ogw_front/components/PackagesVersions.vue";
 import Stepper from "@ogw_front/components/Stepper.vue";
-
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { useStepperTree } from "@ogw_front/composables/stepper_tree";
-import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
 
 const infraStore = useInfraStore();
 
diff --git a/app/components/ZScaling.vue b/app/components/ZScaling.vue
index a1e86e88..25445201 100644
--- a/app/components/ZScaling.vue
+++ b/app/components/ZScaling.vue
@@ -13,11 +13,13 @@ interface Props {
 
 const { width = DEFAULT_PANEL_WIDTH, escapeFunction = undefined } = defineProps<Props>();
 
-const emit = defineEmits<{
+interface Emits {
   apply: [];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
-function apply() {
+function apply(): void {
   emit("apply");
   show.value = false;
 }
diff --git a/app/components/csv-preview/CsvPreviewer.vue b/app/components/csv-preview/CsvPreviewer.vue
index 2d2ce439..c62b6fd1 100644
--- a/app/components/csv-preview/CsvPreviewer.vue
+++ b/app/components/csv-preview/CsvPreviewer.vue
@@ -33,26 +33,28 @@ const MIN_AVG_COUNT = 1.5;
 const MAX_VARIANCE = 0.5;
 const PREVIEW_ROWS_LIMIT = 101;
 
-const emit = defineEmits<{
+interface Emits {
   "update:modelValue": [value: boolean];
   confirm: [result: CsvParseResult];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
-const separator = ref(",");
-const headerRow = ref(0);
-const firstRow = ref(1);
+const separator = ref<string>(",");
+const headerRow = ref<number>(0);
+const firstRow = ref<number>(1);
 
 const xColumn = ref<string | undefined>(undefined);
 const yColumn = ref<string | undefined>(undefined);
 const zColumn = ref<string | undefined>(undefined);
 
-const rawContent = ref("");
+const rawContent = ref<string>("");
 const previewRows = ref<CsvRow[]>([]);
 const previewHeaders = ref<CsvHeader[]>([]);
-const loading = ref(false);
+const loading = ref<boolean>(false);
 const toggleLoading = useToggle(loading);
 
-function autoDetectSeparator(content: string) {
+function autoDetectSeparator(content: string): string {
   const lines = content
     .slice(0, MAX_CONTENT_SLICE)
     .split(/\r?\n/u)
@@ -75,9 +77,9 @@ function autoDetectSeparator(content: string) {
   return best;
 }
 
-function parseContent() {
+function parseContent(): string[] {
   if (!rawContent.value) {
-    return;
+    return [];
   }
 
   const allLines = rawContent.value.split(/\r?\n/u).filter((line) => line.trim() !== "");
@@ -89,8 +91,7 @@ function parseContent() {
     const result = [];
     let current = "";
     let inQuotes = false;
-    for (let index = 0; index < line.length; index += 1) {
-      const char = line[index];
+    for (const char of line) {
       if (char === '"') {
         inQuotes = !inQuotes;
       } else if (char === separator.value && !inQuotes) {
@@ -125,7 +126,7 @@ function parseContent() {
   });
 }
 
-function readAndParse() {
+function readAndParse(): void {
   if (!file) {
     return;
   }
@@ -145,7 +146,8 @@ function readAndParse() {
   });
   reader.readAsText(file, "utf8");
 }
-const computedResult = computed(() => {
+
+const computedResult = computed<CsvParseResult>(() => {
   const xIndex = previewHeaders.value.findIndex((header) => header.key === xColumn.value);
   const yIndex = previewHeaders.value.findIndex((header) => header.key === yColumn.value);
   const zIndex = previewHeaders.value.findIndex((header) => header.key === zColumn.value);
@@ -160,7 +162,7 @@ const computedResult = computed(() => {
   };
 });
 
-const isFormValid = computed(
+const isFormValid = computed<boolean>(
   () =>
     separator.value !== "" &&
     separator.value !== undefined &&
@@ -197,7 +199,7 @@ watch(
   },
 );
 
-function onConfirm() {
+function onConfirm(): void {
   emit("confirm", computedResult.value);
   emit("update:modelValue", false);
 }
diff --git a/app/components/csv-preview/CsvSettings.vue b/app/components/csv-preview/CsvSettings.vue
index 11358510..4586b437 100644
--- a/app/components/csv-preview/CsvSettings.vue
+++ b/app/components/csv-preview/CsvSettings.vue
@@ -17,9 +17,11 @@ const xColumn = defineModel<string>("xColumn");
 const yColumn = defineModel<string>("yColumn");
 const zColumn = defineModel<string>("zColumn");
 
-const emit = defineEmits<{
+interface Emits {
   "update:separator": [value: string];
-}>();
+}
+
+const emit = defineEmits<Emits>();
 
 const separators = [
   { title: "Comma (,)", value: "," },
@@ -30,8 +32,8 @@ const separators = [
   { title: "Custom", value: "custom" },
 ];
 
-const selectedType = ref(",");
-const customValue = ref("");
+const selectedType = ref<string>(",");
+const customValue = ref<string>("");
 
 watch(
   () => separator,
diff --git a/app/components/csv-preview/CsvTable.vue b/app/components/csv-preview/CsvTable.vue
index e25cd436..e5aae812 100644
--- a/app/components/csv-preview/CsvTable.vue
+++ b/app/components/csv-preview/CsvTable.vue
@@ -32,7 +32,7 @@ const {
   firstRow = 1,
 } = defineProps<Props>();
 
-function getColumnClass(key: string) {
+function getColumnClass(key: string): string {
   if (key === coordinates.x) {
     return "x-col-highlight";
   }
diff --git a/app/composables/batch_style.ts b/app/composables/batch_style.ts
index 5616b901..4ebf59b2 100644
--- a/app/composables/batch_style.ts
+++ b/app/composables/batch_style.ts
@@ -1,7 +1,7 @@
 import { useDataStore } from "@ogw_front/stores/data";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
 
-export function useBatchStyle() {
+export function useBatchStyle(): { applyBatchStyle: typeof applyBatchStyle } {
   const treeviewStore = useTreeviewStore();
   const dataStore = useDataStore();
 
@@ -22,17 +22,16 @@ export function useBatchStyle() {
       const promises = treeviewStore.activeItems.map(async (selectedId) => {
         try {
           const item = await dataStore.item(selectedId);
-          if (item && item.geode_object_type === targetType) {
+          if (item.geode_object_type === targetType) {
             await action(selectedId);
           }
-        } catch (error) {
-          console.error("Failed to apply batch style to item", selectedId, error);
+        } catch {
+          // Ignore items that fail to load; batch style continues for the rest.
         }
       });
 
       await Promise.all(promises);
-    } catch (error) {
-      console.error("Failed to fetch current item for batch style", id, error);
+    } catch {
       await action(id);
     }
   }
diff --git a/app/composables/clipping_planes_widget.ts b/app/composables/clipping_planes_widget.ts
index 66d24dd8..17f32cc0 100644
--- a/app/composables/clipping_planes_widget.ts
+++ b/app/composables/clipping_planes_widget.ts
@@ -1,58 +1,38 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import {
-  AXIS_SCALE,
   CHANGE_THRESHOLD,
-  PLANE_COLORS,
-  SIZE_RATIO,
+  type MainCameraOptions,
+  type SceneBoundsInfo,
+  alignCameraToMainCamera,
   computeSceneBoundsInfo,
-  getPlaneStyle,
-  hasPlaneChanged,
+  resolveActiveActors,
 } from "@ogw_front/utils/clipping_planes";
-import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
-// ImplicitPlaneWidget ships no type declarations at all (unlike most of vtk.js), unlike a module that simply doesn't exist, so it can't be given an ambient `declare module` shim either - suppress the resulting implicit-any error at the import site instead.
-// @ts-expect-error -- see comment above; newInstance() below is implicitly `any`.
-import { newInstance as vtkImplicitPlaneWidget } from "@kitware/vtk.js/Widgets/Widgets3D/ImplicitPlaneWidget";
-import { newInstance as vtkWidgetManager } from "@kitware/vtk.js/Widgets/Core/WidgetManager";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { vtkWidgetManager as WidgetManagerInstance } from "@kitware/vtk.js/Widgets/Core/WidgetManager";
-import type { Ref } from "vue";
-import type vtkActor from "@kitware/vtk.js/Rendering/Core/Actor";
-import type { vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
+import {
+  type ClippingPlane,
+  useWidgetEntryManager,
+} from "@ogw_front/composables/clipping_planes_widget_entries";
+import {
+  type vtkWidgetManager as WidgetManagerInstance,
+  newInstance as vtkWidgetManager,
+} from "@kitware/vtk.js/Widgets/Core/WidgetManager";
 import type { vtkGenericRenderWindow as GenericRenderWindowInstance } from "@ogw_internal/stores/hybrid_viewer/vtk_types";
 import type { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-
-interface ClippingPlane {
-  origin?: number[];
-  normal: number[];
-}
+import type { vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
+import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
 
 interface DataItemLike {
   id: string;
 }
 
-// Vtk.js's plane-widget factory/handle/state objects (from ImplicitPlaneWidget, which ships no type declarations) are kept as `any` here - deep vtk.js widget internals with no typed surface to build on.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type PlaneWidget = any;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type WidgetHandle = any;
-
-interface WidgetEntry {
-  planeWidget: PlaneWidget;
-  widgetHandle: WidgetHandle;
-  subscription: { unsubscribe: () => void };
-}
-
 interface ClippingPlanesWidgetParams {
   planes: Ref<ClippingPlane[]>;
   targetAllVisible: Ref<boolean>;
   selectedDatasetIds: Ref<string[]>;
   allItems: Ref<DataItemLike[]>;
   hybridViewerStore: ReturnType<typeof useHybridViewerStore>;
-  debouncedApply: (...args: unknown[]) => void;
+  debouncedApply: (...args: readonly unknown[]) => void;
 }
 
-// oxlint-disable-next-line max-params max-lines-per-function
+// oxlint-disable-next-line max-params max-lines-per-function typescript/prefer-readonly-parameter-types -- Ref-backed params are inherently mutable through .value.
 function useClippingPlanesWidget({
   planes,
   targetAllVisible,
@@ -60,119 +40,49 @@ function useClippingPlanesWidget({
   allItems,
   hybridViewerStore,
   debouncedApply,
-}: ClippingPlanesWidgetParams) {
+}: Readonly<ClippingPlanesWidgetParams>): {
+  getSceneCenter: typeof getSceneCenter;
+  syncWidgets: typeof syncWidgets;
+  syncLocalCamera: typeof syncLocalCamera;
+  cleanupLocalWidget: typeof cleanupLocalWidget;
+  initLocalWidget: typeof initLocalWidget;
+  updateWidgetPlacement: typeof updateWidgetPlacement;
+  isFromWidget: typeof isFromWidget;
+  setFromWidget: typeof setFromWidget;
+} {
   let localRenderWindow: GenericRenderWindowInstance | undefined = undefined;
   let widgetManager: WidgetManagerInstance | undefined = undefined;
-  let widgetEntries: WidgetEntry[] = [];
-  let fromWidget = false;
   let maxDistance = 0;
   let isLimitingCameraZoom = false;
-  function resolveActiveActors(): vtkActor[] {
-    const targetIds = targetAllVisible.value
-      ? allItems.value.map((item) => item.id)
-      : selectedDatasetIds.value;
-    const targeted = targetIds
-      .map((id) => {
-        const item = hybridViewerStore.hybridDb[id];
-        return item ? item.actor : undefined;
-      })
-      .filter((actor): actor is vtkActor => Boolean(actor));
-    if (targeted.length > 0) {
-      return targeted;
-    }
-    return Object.values(hybridViewerStore.hybridDb)
-      .map((entry) => entry && entry.actor)
-      .filter((actor): actor is vtkActor => Boolean(actor));
-  }
-  function getSceneBoundsInfo() {
-    return computeSceneBoundsInfo(resolveActiveActors());
+  const widgetEntryManager = useWidgetEntryManager({ planes, debouncedApply });
+
+  function getSceneBoundsInfo(): SceneBoundsInfo {
+    return computeSceneBoundsInfo(
+      resolveActiveActors(
+        targetAllVisible.value,
+        allItems.value,
+        selectedDatasetIds.value,
+        hybridViewerStore.hybridDb,
+      ),
+    );
   }
-  function getSceneCenter(): number[] {
+  function getSceneCenter(): readonly number[] {
     return getSceneBoundsInfo().center;
   }
-  function createWidgetEntry(
-    planeWidget: PlaneWidget,
-    widgetHandle: WidgetHandle,
-    planeIndex: number,
-  ): WidgetEntry {
-    const widgetState = planeWidget.getWidgetState();
-    const plane = planes.value[planeIndex];
-    if (plane?.origin) {
-      widgetState.setOrigin(plane.origin);
-    }
-    if (plane) {
-      widgetState.setNormal(plane.normal);
-    }
-    const subscription = widgetState.onModified(() => {
-      if (fromWidget) {
-        return;
-      }
-      const origin: number[] = widgetState.getOrigin().map((val: number) => Number(val.toFixed(4)));
-      const normal: number[] = widgetState.getNormal().map((val: number) => Number(val.toFixed(4)));
-      const currentPlane = planes.value[planeIndex];
-      if (
-        !currentPlane ||
-        !hasPlaneChanged(origin, normal, currentPlane.origin, currentPlane.normal)
-      ) {
-        return;
-      }
-      fromWidget = true;
-      currentPlane.origin = origin;
-      currentPlane.normal = normal;
-      nextTick(() => {
-        fromWidget = false;
-      });
-      debouncedApply();
-    });
-    return {
-      planeWidget,
-      widgetHandle,
-      subscription,
-    };
-  }
+
   function syncWidgets(): void {
     if (!widgetManager || !localRenderWindow) {
       return;
     }
-    while (widgetEntries.length > planes.value.length) {
-      const entry = widgetEntries.pop();
-      if (!entry) {
-        continue;
-      }
-      entry.subscription.unsubscribe();
-      widgetManager.removeWidget(entry.planeWidget);
-      entry.planeWidget.delete();
-    }
+    widgetEntryManager.removeExtraWidgets(widgetManager);
     const { cubicBounds } = getSceneBoundsInfo();
     for (const [idx, plane] of planes.value.entries()) {
-      // Modulo guarantees this index is within bounds of the non-empty PLANE_COLORS array.
-      const rgb = PLANE_COLORS[idx % PLANE_COLORS.length]!;
-      if (!widgetEntries[idx]) {
-        const planeWidget = vtkImplicitPlaneWidget();
-        const widgetHandle = widgetManager.addWidget(planeWidget);
-        widgetHandle.setAxisScale(AXIS_SCALE);
-        widgetHandle.setHandleSizeRatio(SIZE_RATIO);
-        widgetEntries.push(createWidgetEntry(planeWidget, widgetHandle, idx));
-      }
-      const entry = widgetEntries[idx];
-      if (!entry) {
-        continue;
-      }
-      entry.widgetHandle.setRepresentationStyle(getPlaneStyle(rgb));
-      fromWidget = true;
-      entry.widgetHandle.placeWidget(cubicBounds);
-      fromWidget = false;
-      entry.widgetHandle.setAxisScale(AXIS_SCALE);
-      entry.widgetHandle.setHandleSizeRatio(SIZE_RATIO);
-      const widgetState = entry.planeWidget.getWidgetState();
-      if (plane.origin) {
-        widgetState.setOrigin(plane.origin);
-      }
-      widgetState.setNormal(plane.normal);
+      widgetEntryManager.updateWidgetEntry(idx, plane, cubicBounds, widgetManager);
     }
     localRenderWindow.getRenderWindow().render();
   }
-  function limitCameraZoomOut(camera: vtkCamera): void {
+
+  function limitCameraZoomOut(camera: Readonly<vtkCamera>): void {
     if (maxDistance <= 0 || isLimitingCameraZoom) {
       return;
     }
@@ -192,65 +102,33 @@ function useClippingPlanesWidget({
     localRenderWindow?.getRenderWindow().render();
     isLimitingCameraZoom = false;
   }
-  // The `noUncheckedIndexedAccess` compiler option (needed elsewhere in this migration) forces every `focal_point[i]`/`position[i]`/`view_up[i]` access below into its own `?? 0` fallback branch, which is what pushes this pre-existing function's cyclomatic complexity over the limit - the control flow itself is unchanged from the plain-JS version.
-  // oxlint-disable-next-line complexity
+
   function syncLocalCamera(): void {
     if (!localRenderWindow) {
       return;
     }
     const renderer = localRenderWindow.getRenderer();
     const camera = renderer.getActiveCamera();
-    const mainCam = hybridViewerStore.camera_options as {
-      focal_point?: number[];
-      position?: number[];
-      view_up?: number[];
-    };
+    const mainCam = hybridViewerStore.camera_options as MainCameraOptions;
     const { center, cubicBounds } = getSceneBoundsInfo();
+    // oxlint-disable-next-line no-unsafe-type-assertion -- cubicBounds is always a 6-element bounds tuple.
     renderer.resetCamera(cubicBounds as [number, number, number, number, number, number]);
-    if (mainCam && mainCam.focal_point && mainCam.position) {
-      const { focal_point, position } = mainCam;
-      const dir = [
-        (position[0] ?? 0) - (focal_point[0] ?? 0),
-        (position[1] ?? 0) - (focal_point[1] ?? 0),
-        (position[2] ?? 0) - (focal_point[2] ?? 0),
-      ];
-      const dirLen = Math.hypot(...dir);
-      if (dirLen > 0) {
-        const distance = camera.getDistance();
-        const normDir = dir.map((component) => component / dirLen);
-        camera.setFocalPoint(center[0] ?? 0, center[1] ?? 0, center[2] ?? 0);
-        camera.setPosition(
-          (center[0] ?? 0) + (normDir[0] ?? 0) * distance,
-          (center[1] ?? 0) + (normDir[1] ?? 0) * distance,
-          (center[2] ?? 0) + (normDir[2] ?? 0) * distance,
-        );
-        if (mainCam.view_up) {
-          const [viewUpX = 0, viewUpY = 0, viewUpZ = 0] = mainCam.view_up;
-          camera.setViewUp(viewUpX, viewUpY, viewUpZ);
-        }
-      }
-    }
+    alignCameraToMainCamera(camera, mainCam, center);
     limitCameraZoomOut(camera);
     localRenderWindow.getRenderWindow().render();
   }
+
   function cleanupLocalWidget(): void {
     maxDistance = 0;
     isLimitingCameraZoom = false;
-    for (const entry of widgetEntries) {
-      entry.subscription.unsubscribe();
-      if (widgetManager) {
-        widgetManager.removeWidget(entry.planeWidget);
-      }
-      entry.planeWidget.delete();
-    }
-    widgetEntries = [];
+    widgetEntryManager.cleanupAll(widgetManager);
     if (localRenderWindow) {
       localRenderWindow.delete();
       localRenderWindow = undefined;
       widgetManager = undefined;
     }
   }
-  function updateWidgetPlacement({ isReset = false } = {}): void {
+  function updateWidgetPlacement({ isReset = false }: Readonly<{ isReset?: boolean }> = {}): void {
     if (!widgetManager || !localRenderWindow) {
       return;
     }
@@ -270,22 +148,34 @@ function useClippingPlanesWidget({
     }
   }
 
-  function initLocalWidget(container: HTMLElement): void {
+  function initLocalWidget(container: Readonly<HTMLElement>): void {
     cleanupLocalWidget();
-    container.addEventListener("wheel", (event) => event.stopPropagation(), { passive: true });
+    container.addEventListener(
+      "wheel",
+      (event: Readonly<WheelEvent>) => {
+        event.stopPropagation();
+      },
+      { passive: true },
+    );
     localRenderWindow = vtkGenericRenderWindow({
       background: [0, 0, 0, 0],
       listenWindowResize: false,
     });
     localRenderWindow.setContainer(container);
     const camera = localRenderWindow.getRenderer().getActiveCamera();
-    camera.onModified(() => limitCameraZoomOut(camera));
-    const canvas = (
-      localRenderWindow.getApiSpecificRenderWindow() as unknown as {
-        getCanvas: () => HTMLCanvasElement;
-      }
-    ).getCanvas();
-    Object.assign(canvas.style, { width: "100%", height: "100%", background: "transparent" });
+    camera.onModified(() => {
+      limitCameraZoomOut(camera);
+    });
+    // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+    const openGLRenderWindow = localRenderWindow.getApiSpecificRenderWindow() as unknown as {
+      getCanvas: () => HTMLCanvasElement;
+    };
+    const canvas = openGLRenderWindow.getCanvas();
+    Object.assign(canvas.style, {
+      width: "100%",
+      height: "100%",
+      background: "transparent",
+    });
     localRenderWindow.resize();
     widgetManager = vtkWidgetManager();
     widgetManager.setRenderer(localRenderWindow.getRenderer());
@@ -293,11 +183,13 @@ function useClippingPlanesWidget({
   }
 
   function isFromWidget(): boolean {
-    return fromWidget;
+    return widgetEntryManager.isFromWidget();
   }
+
   function setFromWidget(value: boolean): void {
-    fromWidget = value;
+    widgetEntryManager.setFromWidget(value);
   }
+
   return {
     getSceneCenter,
     syncWidgets,
diff --git a/app/composables/clipping_planes_widget_entries.ts b/app/composables/clipping_planes_widget_entries.ts
new file mode 100644
index 00000000..f920745e
--- /dev/null
+++ b/app/composables/clipping_planes_widget_entries.ts
@@ -0,0 +1,191 @@
+import {
+  AXIS_SCALE,
+  PLANE_COLORS,
+  SIZE_RATIO,
+  getPlaneStyle,
+  hasPlaneChanged,
+} from "@ogw_front/utils/clipping_planes";
+import type { vtkWidgetManager as WidgetManagerInstance } from "@kitware/vtk.js/Widgets/Core/WidgetManager";
+import type vtkAbstractWidget from "@kitware/vtk.js/Widgets/Core/AbstractWidget";
+import type vtkAbstractWidgetFactory from "@kitware/vtk.js/Widgets/Core/AbstractWidgetFactory";
+import { newInstance as vtkImplicitPlaneWidget } from "@kitware/vtk.js/Widgets/Widgets3D/ImplicitPlaneWidget";
+
+interface ClippingPlane {
+  origin?: number[];
+  normal: number[];
+}
+
+interface ClippingWidgetState {
+  getOrigin: () => number[];
+  setOrigin: (origin: readonly number[]) => void;
+  getNormal: () => number[];
+  setNormal: (normal: readonly number[]) => void;
+  onModified: (callback: () => void) => { unsubscribe: () => void };
+}
+
+interface PlaneWidget {
+  getWidgetState: () => ClippingWidgetState;
+  delete: () => void;
+}
+
+interface WidgetHandle {
+  setAxisScale: (scale: number) => void;
+  setHandleSizeRatio: (ratio: number) => void;
+  setRepresentationStyle: (style: unknown) => void;
+  placeWidget: (bounds: readonly number[]) => void;
+}
+
+interface WidgetEntry {
+  planeWidget: PlaneWidget;
+  widgetHandle: WidgetHandle;
+  subscription: { unsubscribe: () => void };
+}
+
+function asWidgetFactory(
+  widget: Readonly<PlaneWidget>,
+): vtkAbstractWidgetFactory<vtkAbstractWidget> {
+  // oxlint-disable-next-line no-unsafe-type-assertion -- vtk.js's WidgetManager APIs (addWidget/removeWidget) are untyped for our custom PlaneWidget shape; narrowed once here.
+  return widget as unknown as vtkAbstractWidgetFactory<vtkAbstractWidget>;
+}
+
+interface WidgetEntryManagerParams {
+  planes: Ref<ClippingPlane[]>;
+  debouncedApply: (...args: readonly unknown[]) => void;
+}
+
+// oxlint-disable-next-line max-lines-per-function typescript/prefer-readonly-parameter-types -- Ref-backed params are inherently mutable through .value.
+function useWidgetEntryManager({ planes, debouncedApply }: Readonly<WidgetEntryManagerParams>): {
+  removeExtraWidgets: (widgetManager: WidgetManagerInstance | undefined) => void;
+  updateWidgetEntry: (
+    idx: number,
+    plane: Readonly<ClippingPlane>,
+    cubicBounds: readonly number[],
+    widgetManager: WidgetManagerInstance,
+  ) => void;
+  cleanupAll: (widgetManager: WidgetManagerInstance | undefined) => void;
+  isFromWidget: () => boolean;
+  setFromWidget: (value: boolean) => void;
+} {
+  let widgetEntries: WidgetEntry[] = [];
+  let fromWidget = false;
+
+  function createWidgetEntry(
+    planeWidget: Readonly<PlaneWidget>,
+    widgetHandle: Readonly<WidgetHandle>,
+    planeIndex: number,
+  ): WidgetEntry {
+    const widgetState = planeWidget.getWidgetState();
+    const plane = planes.value[planeIndex];
+    if (plane?.origin) {
+      widgetState.setOrigin(plane.origin);
+    }
+    if (plane) {
+      widgetState.setNormal(plane.normal);
+    }
+    const subscription = widgetState.onModified(() => {
+      if (fromWidget) {
+        return;
+      }
+      const origin: number[] = widgetState.getOrigin().map((val: number) => Number(val.toFixed(4)));
+      const normal: number[] = widgetState.getNormal().map((val: number) => Number(val.toFixed(4)));
+      const currentPlane = planes.value[planeIndex];
+      if (
+        !currentPlane ||
+        !hasPlaneChanged(origin, normal, currentPlane.origin, currentPlane.normal)
+      ) {
+        return;
+      }
+      fromWidget = true;
+      currentPlane.origin = origin;
+      currentPlane.normal = normal;
+      nextTick(() => {
+        fromWidget = false;
+        // oxlint-disable-next-line promise/prefer-await-to-then -- fire-and-forget inside a sync widget callback; see codebase convention in global_attribute_style.ts.
+      }).catch(() => undefined);
+      debouncedApply();
+    });
+    return {
+      planeWidget,
+      widgetHandle,
+      subscription,
+    };
+  }
+
+  function removeExtraWidgets(widgetManager: WidgetManagerInstance | undefined): void {
+    while (widgetEntries.length > planes.value.length) {
+      const entry = widgetEntries.pop();
+      if (!entry) {
+        continue;
+      }
+      entry.subscription.unsubscribe();
+      widgetManager?.removeWidget(asWidgetFactory(entry.planeWidget));
+      entry.planeWidget.delete();
+    }
+  }
+
+  function updateWidgetEntry(
+    idx: number,
+    plane: Readonly<ClippingPlane>,
+    cubicBounds: readonly number[],
+    widgetManager: WidgetManagerInstance,
+  ): void {
+    // Modulo guarantees this index is within bounds of the non-empty PLANE_COLORS array.
+    const rgb = PLANE_COLORS[idx % PLANE_COLORS.length];
+    if (rgb === undefined) {
+      return;
+    }
+    if (!widgetEntries[idx]) {
+      // oxlint-disable-next-line no-unsafe-call no-unsafe-type-assertion -- vtk.js has no types for ImplicitPlaneWidget's factory; narrowed here.
+      const planeWidget = vtkImplicitPlaneWidget() as PlaneWidget;
+      const widgetHandle = widgetManager.addWidget(
+        asWidgetFactory(planeWidget),
+        // oxlint-disable-next-line no-unsafe-type-assertion -- vtk.js WidgetManager.addWidget is untyped for our custom WidgetHandle shape; narrowed here.
+      ) as unknown as WidgetHandle;
+      widgetEntries.push(createWidgetEntry(planeWidget, widgetHandle, idx));
+    }
+    const entry = widgetEntries[idx];
+    if (!entry) {
+      return;
+    }
+    entry.widgetHandle.setRepresentationStyle(getPlaneStyle(rgb));
+    fromWidget = true;
+    entry.widgetHandle.placeWidget(cubicBounds);
+    fromWidget = false;
+    entry.widgetHandle.setAxisScale(AXIS_SCALE);
+    entry.widgetHandle.setHandleSizeRatio(SIZE_RATIO);
+    const widgetState = entry.planeWidget.getWidgetState();
+    if (plane.origin) {
+      widgetState.setOrigin(plane.origin);
+    }
+    widgetState.setNormal(plane.normal);
+  }
+
+  function cleanupAll(widgetManager: WidgetManagerInstance | undefined): void {
+    for (const entry of widgetEntries) {
+      entry.subscription.unsubscribe();
+      if (widgetManager) {
+        widgetManager.removeWidget(asWidgetFactory(entry.planeWidget));
+      }
+      entry.planeWidget.delete();
+    }
+    widgetEntries = [];
+  }
+
+  function isFromWidget(): boolean {
+    return fromWidget;
+  }
+
+  function setFromWidget(value: boolean): void {
+    fromWidget = value;
+  }
+
+  return {
+    removeExtraWidgets,
+    updateWidgetEntry,
+    cleanupAll,
+    isFromWidget,
+    setFromWidget,
+  };
+}
+
+export { useWidgetEntryManager, type ClippingPlane };
diff --git a/app/composables/global_attribute_style.ts b/app/composables/global_attribute_style.ts
index 4033fffb..e4d644b1 100644
--- a/app/composables/global_attribute_style.ts
+++ b/app/composables/global_attribute_style.ts
@@ -1,8 +1,5 @@
+import type { JsonRpcSchema } from "@ogw_shared/utils/types";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import { computed } from "vue";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Ref } from "vue";
-
 import { getAttributeRange } from "@ogw_front/utils/attributes";
 import { useBackStore } from "@ogw_front/stores/back";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -19,26 +16,67 @@ interface ActiveComponent extends ComponentNameEntry {
   attributeType: string;
 }
 
-// This composable resolves a batch of dynamically-named getter/setter methods on the data style store (e.g. "meshPointsVertexAttributeRange", "setMeshPointsVertexAttributeRange", ...) - the store's real, fully-typed surface has no index signature for this, so dynamic lookups are cast through this loosely-typed view of it, matching how these methods are actually shaped (getters take an id and return a value, setters take an id plus arbitrary arguments).
-type DynamicStore = Record<string, ((...args: unknown[]) => unknown) | undefined>;
+// This composable resolves a batch of dynamically-named getter/setter methods on the data style store (e.g. "meshPointsVertexAttributeRange", "setMeshPointsVertexAttributeRange", ...) - the store's real, fully-typed surface has no index signature for this, so dynamic lookups go through this type guard instead of an unsafe cast of the whole store (which mixes these methods with state refs and other members), matching how these methods are actually shaped (getters take an id and return a value, setters take an id plus arbitrary arguments).
+type DynamicStoreMethod = (...args: readonly unknown[]) => unknown;
+
+function isDynamicStoreMethod(value: unknown): value is DynamicStoreMethod {
+  return typeof value === "function";
+}
+
+function getDynamicStoreMethod(store: object, key: string): DynamicStoreMethod | undefined {
+  const value: unknown = Reflect.get(store, key);
+  return isDynamicStoreMethod(value) ? value : undefined;
+}
 
 interface AttributeStyleComponent {
   coloring?: { active?: string };
 }
 
 interface AttributeResponse {
-  attributes?: {
-    attribute_name?: string;
-    min_values?: number[];
-    max_values?: number[];
-    min_value?: number;
-    max_value?: number;
+  readonly attributes?: readonly {
+    readonly attribute_name?: string;
+    readonly min_values?: readonly number[];
+    readonly max_values?: readonly number[];
+    readonly min_value?: number;
+    readonly max_value?: number;
   }[];
 }
 
-export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
+function isColoringValue(
+  value: unknown,
+): value is NonNullable<AttributeStyleComponent["coloring"]> {
+  return typeof value === "object" && value !== null;
+}
+
+function isJsonRpcSchema(value: unknown): value is JsonRpcSchema {
+  return (
+    typeof value === "object" && value !== null && "$id" in value && typeof value.$id === "string"
+  );
+}
+
+function isAttributeResponse(value: unknown): value is AttributeResponse {
+  return typeof value === "object" && value !== null;
+}
+
+function isNumberArray(value: unknown): value is number[] {
+  return Array.isArray(value) && value.every((item) => typeof item === "number");
+}
+
+function isStringOrUndefined(value: unknown): value is string | undefined {
+  return value === undefined || typeof value === "string";
+}
+
+function isNumberOrUndefined(value: unknown): value is number | undefined {
+  return value === undefined || typeof value === "number";
+}
+
+export function useGlobalAttributeStyle(dataIdRef: Readonly<Ref<string | undefined>>): {
+  currentColormap: typeof currentColormap;
+  currentRange: typeof currentRange;
+  applyGlobalColormap: typeof applyGlobalColormap;
+  resetGlobalRange: typeof resetGlobalRange;
+} {
   const dataStyleStore = useDataStyleStore();
-  const dynamicDataStyleStore = dataStyleStore as unknown as DynamicStore;
   const hybridViewerStore = useHybridViewerStore();
   const backStore = useBackStore();
 
@@ -51,23 +89,47 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
   ];
 
   function getActiveComponents(targetId: string): ActiveComponent[] {
-    const style = dataStyleStore.getStyle(targetId) as unknown as Record<
-      string,
-      AttributeStyleComponent | undefined
-    >;
+    const style = dataStyleStore.getStyle(targetId);
     const activeComponents: ActiveComponent[] = [];
-    if (!style) {
-      return activeComponents;
-    }
     for (const { key, getterKey, setterKey } of componentNames) {
-      const componentStyle = style[key];
-      if (!componentStyle || !componentStyle.coloring) {
+      let componentStyle: Record<string, unknown> | undefined = undefined;
+      switch (key) {
+        case "points": {
+          componentStyle = style.points;
+          break;
+        }
+        case "edges": {
+          componentStyle = style.edges;
+          break;
+        }
+        case "polygons": {
+          componentStyle = style.polygons;
+          break;
+        }
+        case "cells": {
+          componentStyle = style.cells;
+          break;
+        }
+        case "polyhedra": {
+          componentStyle = style.polyhedra;
+          break;
+        }
+        default: {
+          componentStyle = undefined;
+        }
+      }
+      if (componentStyle === undefined) {
         continue;
       }
 
-      const activeColoring = componentStyle.coloring.active;
+      const { coloring } = componentStyle;
+      if (!isColoringValue(coloring)) {
+        continue;
+      }
+
+      const { active: activeColoring } = coloring;
       if (
-        !activeColoring ||
+        activeColoring === undefined ||
         !["vertex", "edge", "polygon", "cell", "polyhedron"].includes(activeColoring)
       ) {
         continue;
@@ -79,19 +141,19 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
     return activeComponents;
   }
 
-  const currentColormap = computed(() => {
+  const currentColormap = computed((): string => {
     const targetId = dataIdRef.value;
-    if (!targetId) {
+    if (targetId === undefined || targetId === "") {
       return "batlow";
     }
 
     for (const comp of getActiveComponents(targetId)) {
       const getterName = `${comp.getterKey}${comp.attributeType}ColorMap`;
-      const getter = dynamicDataStyleStore[getterName];
+      const getter = getDynamicStoreMethod(dataStyleStore, getterName);
       if (getter) {
         const colorMap = getter(targetId);
-        if (colorMap) {
-          return colorMap as string;
+        if (typeof colorMap === "string" && colorMap.length > 0) {
+          return colorMap;
         }
       }
     }
@@ -99,18 +161,39 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
     return "batlow";
   });
 
-  const currentRange = computed<[number, number]>({
-    get() {
+  async function applyCurrentRange(newValue: readonly [number, number]): Promise<void> {
+    const targetId = dataIdRef.value;
+    if (targetId === undefined || targetId === "") {
+      return;
+    }
+
+    let updated = false;
+    for (const comp of getActiveComponents(targetId)) {
+      const setterName = `set${comp.setterKey}${comp.attributeType}Range`;
+      const setter = getDynamicStoreMethod(dataStyleStore, setterName);
+      if (setter) {
+        setter(targetId, newValue[0], newValue[1]);
+        updated = true;
+      }
+    }
+    if (updated) {
+      await hybridViewerStore.remoteRender();
+    }
+  }
+
+  const currentRange = computed<readonly [number, number]>({
+    get(): readonly [number, number] {
       const targetId = dataIdRef.value;
-      if (!targetId) {
+      if (targetId === undefined || targetId === "") {
         return [0, 1];
       }
 
       for (const comp of getActiveComponents(targetId)) {
         const getterName = `${comp.getterKey}${comp.attributeType}Range`;
-        const getter = dynamicDataStyleStore[getterName];
+        const getter = getDynamicStoreMethod(dataStyleStore, getterName);
         if (getter) {
-          const range = getter(targetId) as number[] | undefined;
+          const rawRange = getter(targetId);
+          const range = isNumberArray(rawRange) ? rawRange : undefined;
           if (range && range.length === 2) {
             return [range[0] ?? 0, range[1] ?? 1];
           }
@@ -118,30 +201,16 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
       }
       return [0, 1];
     },
-    set(newValue) {
-      const targetId = dataIdRef.value;
-      if (!targetId) {
-        return;
-      }
-
-      let updated = false;
-      for (const comp of getActiveComponents(targetId)) {
-        const setterName = `set${comp.setterKey}${comp.attributeType}Range`;
-        const setter = dynamicDataStyleStore[setterName];
-        if (setter) {
-          setter(targetId, newValue[0], newValue[1]);
-          updated = true;
-        }
-      }
-      if (updated) {
-        hybridViewerStore.remoteRender();
-      }
+    // Vue's WritableComputedOptions setter is strictly `(v: T) => void`, so the async render call is delegated to a helper (see the same trade-off in `app/composables/hover_highlight.ts`'s `onHoverEnter`).
+    set: (newValue: readonly [number, number]): void => {
+      /* oxlint-disable-next-line promise/prefer-await-to-then -- setter cannot be async; see comment above. */
+      applyCurrentRange(newValue).catch(() => undefined);
     },
   });
 
   async function applyGlobalColormap(newMap: string): Promise<void> {
     const targetId = dataIdRef.value;
-    if (!targetId) {
+    if (targetId === undefined || targetId === "") {
       return;
     }
 
@@ -149,7 +218,7 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
 
     for (const comp of getActiveComponents(targetId)) {
       const setterName = `set${comp.setterKey}${comp.attributeType}ColorMap`;
-      const setter = dynamicDataStyleStore[setterName];
+      const setter = getDynamicStoreMethod(dataStyleStore, setterName);
 
       if (setter) {
         promises.push(Promise.resolve(setter(targetId, newMap)));
@@ -157,61 +226,72 @@ export function useGlobalAttributeStyle(dataIdRef: Ref<string | undefined>) {
     }
 
     await Promise.all(promises);
-    hybridViewerStore.remoteRender();
+    await hybridViewerStore.remoteRender();
   }
 
-  function resetGlobalRange(): void {
+  async function resetGlobalRange(): Promise<void> {
     const targetId = dataIdRef.value;
-    if (!targetId) {
+    if (targetId === undefined || targetId === "") {
       return;
     }
 
+    const requestPromises: Promise<unknown>[] = [];
+
     for (const comp of getActiveComponents(targetId)) {
       const { activeColoring, attributeType, getterKey, setterKey } = comp;
 
-      const nameGetter = dynamicDataStyleStore[`${getterKey}${attributeType}Name`];
-      const itemGetter = dynamicDataStyleStore[`${getterKey}${attributeType}Item`];
+      const nameGetter = getDynamicStoreMethod(dataStyleStore, `${getterKey}${attributeType}Name`);
+      const itemGetter = getDynamicStoreMethod(dataStyleStore, `${getterKey}${attributeType}Item`);
       if (!nameGetter || !itemGetter) {
         continue;
       }
 
-      const attrName = nameGetter(targetId) as string | undefined;
-      const attrItem = (itemGetter(targetId) as number | undefined) ?? 0;
+      const rawAttrName = nameGetter(targetId);
+      const attrName = isStringOrUndefined(rawAttrName) ? rawAttrName : undefined;
+      const rawAttrItem = itemGetter(targetId);
+      const attrItem = (isNumberOrUndefined(rawAttrItem) ? rawAttrItem : undefined) ?? 0;
 
-      if (!attrName) {
+      if (attrName === undefined || attrName === "") {
         continue;
       }
 
       const schemaName = `${activeColoring}_attribute_names`;
       const backSchemas = back_schemas.opengeodeweb_back as Record<string, unknown>;
       const schema = backSchemas[schemaName];
-      if (!schema) {
+      if (schema === undefined || !isJsonRpcSchema(schema)) {
         continue;
       }
 
-      backStore.request(
-        {
-          schema: schema as Parameters<typeof backStore.request>[0]["schema"],
-          params: { id: targetId },
-        },
-        {
-          response_function: (response: unknown) => {
-            const attributes = (response as AttributeResponse).attributes || [];
-            const currentAttribute = attributes.find((attr) => attr.attribute_name === attrName);
-            if (currentAttribute) {
-              const { min, max } = getAttributeRange(currentAttribute, attrItem);
-
-              const setterName = `set${setterKey}${attributeType}Range`;
-              const setter = dynamicDataStyleStore[setterName];
-              if (setter) {
-                setter(targetId, min, max);
-                hybridViewerStore.remoteRender();
+      requestPromises.push(
+        backStore.request(
+          {
+            schema,
+            params: { id: targetId },
+          },
+          {
+            response_function: async (response: unknown): Promise<void> => {
+              if (!isAttributeResponse(response)) {
+                return;
+              }
+              const attributes = response.attributes ?? [];
+              const currentAttribute = attributes.find((attr) => attr.attribute_name === attrName);
+              if (currentAttribute) {
+                const { min, max } = getAttributeRange(currentAttribute, attrItem);
+
+                const setterName = `set${setterKey}${attributeType}Range`;
+                const setter = getDynamicStoreMethod(dataStyleStore, setterName);
+                if (setter) {
+                  setter(targetId, min, max);
+                  await hybridViewerStore.remoteRender();
+                }
               }
-            }
+            },
           },
-        },
+        ),
       );
     }
+
+    await Promise.all(requestPromises);
   }
 
   return {
diff --git a/app/composables/hover_highlight.ts b/app/composables/hover_highlight.ts
index add6c395..f824b883 100644
--- a/app/composables/hover_highlight.ts
+++ b/app/composables/hover_highlight.ts
@@ -1,3 +1,4 @@
+import type { JsonRpcSchema } from "@ogw_shared/utils/types";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import vtk_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -5,9 +6,12 @@ import vtk_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.
 const HOVER_DELAY = 200;
 
 type HighlightType = "mesh" | "model";
-type BlockIdsProvider = number[] | (() => number[] | Promise<number[]>);
+type BlockIdsProvider = readonly number[] | (() => readonly number[] | Promise<readonly number[]>);
 
-export function useHoverhighlight() {
+export function useHoverhighlight(): {
+  onHoverEnter: typeof onHoverEnter;
+  onHoverLeave: typeof onHoverLeave;
+} {
   const viewerStore = useViewerStore();
   const dataStore = useDataStore();
   let timer: ReturnType<typeof setTimeout> | undefined = undefined;
@@ -26,7 +30,7 @@ export function useHoverhighlight() {
     }
     const schema = vtk_schemas.opengeodeweb_viewer[type].highlight;
 
-    async function highlightAction() {
+    async function highlightAction(): Promise<void> {
       currentId = id;
       currentType = type;
 
@@ -34,11 +38,14 @@ export function useHoverhighlight() {
         return;
       }
 
-      let block_ids: number[] =
-        typeof block_ids_provider === "function" ? await block_ids_provider() : block_ids_provider;
+      let block_ids: number[] = [
+        ...(typeof block_ids_provider === "function"
+          ? await block_ids_provider()
+          : block_ids_provider),
+      ];
 
       block_ids = (Array.isArray(block_ids) ? block_ids : [])
-        .map((blockId) => Math.trunc(Number(blockId)))
+        .map((blockId) => Math.trunc(blockId))
         .filter((blockId) => !Number.isNaN(blockId));
 
       if (currentId !== id) {
@@ -57,10 +64,38 @@ export function useHoverhighlight() {
       }
     }
 
+    async function runHighlightAction(): Promise<void> {
+      try {
+        await highlightAction();
+      } catch {
+        // Ignore
+      }
+    }
+
     if (immediate) {
-      highlightAction();
+      // oxlint-disable-next-line typescript/no-floating-promises -- runHighlightAction catches its own errors internally.
+      runHighlightAction();
     } else {
-      timer = setTimeout(highlightAction, HOVER_DELAY);
+      timer = setTimeout(() => {
+        // oxlint-disable-next-line typescript/no-floating-promises -- runHighlightAction catches its own errors internally.
+        runHighlightAction();
+      }, HOVER_DELAY);
+    }
+  }
+
+  async function unhighlightAction(
+    type: HighlightType,
+    id: string,
+    request: Readonly<{
+      schema: JsonRpcSchema;
+      params?: Readonly<Record<string, unknown>>;
+      timeout?: number;
+    }>,
+  ): Promise<void> {
+    try {
+      await viewerStore.request(request);
+    } catch (error) {
+      console.error(`Unhighlight failed for ${type} ${id}:`, error);
     }
   }
 
@@ -76,16 +111,13 @@ export function useHoverhighlight() {
         visibility: false,
         ...(currentType === "model" && { block_ids: [] }),
       };
-      try {
-        viewerStore.request({ schema, params });
-      } catch (error) {
-        console.error(`Unhighlight failed for ${currentType} ${id}:`, error);
-      }
+      // oxlint-disable-next-line typescript/no-floating-promises -- unhighlightAction catches its own errors internally.
+      unhighlightAction(currentType, id, { schema, params });
       currentId = undefined;
       currentType = undefined;
     }
 
-    if (!currentId) {
+    if (currentId === undefined) {
       currentId = undefined;
       currentType = undefined;
     }
diff --git a/app/composables/model_collections.ts b/app/composables/model_collections.ts
index 6a888572..d3ea2d82 100644
--- a/app/composables/model_collections.ts
+++ b/app/composables/model_collections.ts
@@ -1,15 +1,26 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { compareSelections } from "@ogw_front/utils/treeview";
-import { useDataStore } from "@ogw_front/stores/data";
-import { useDataStyleStore } from "@ogw_front/stores/data_style";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import type {
   CollectionComponent,
   CollectionComponentGroup,
 } from "@ogw_front/stores/data_helpers/collections";
+import { compareSelections } from "@ogw_front/utils/treeview";
+import { useDataStore } from "@ogw_front/stores/data";
+import { useDataStyleStore } from "@ogw_front/stores/data_style";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+
+// The `watch` callback receives the freshly-fetched collection groups purely for reading (matching against and copying into `localCategories`, never mutated in place), so it's typed with its own fully-readonly mirror of `CollectionComponentGroup` rather than that (intentionally mutable, see `existing.title` below) store type directly.
+interface ReadonlyCollectionComponentGroup {
+  readonly id: string;
+  readonly title: string;
+  readonly children: readonly CollectionComponent[];
+}
 
-export function useModelCollections(viewId: string) {
+export function useModelCollections(viewId: string): {
+  items: typeof items;
+  collectionsCache: typeof collectionsCache;
+  localCategories: typeof localCategories;
+  selection: typeof selection;
+  updateVisibility: typeof updateVisibility;
+} {
   const dataStore = useDataStore();
   const dataStyleStore = useDataStyleStore();
   const hybridViewerStore = useHybridViewerStore();
@@ -25,7 +36,7 @@ export function useModelCollections(viewId: string) {
 
   watch(
     items,
-    async (newItems) => {
+    async (newItems: readonly ReadonlyCollectionComponentGroup[] | undefined) => {
       if (!newItems) {
         localCategories.value = [];
         return;
@@ -34,8 +45,10 @@ export function useModelCollections(viewId: string) {
       const data = await dataStore.fetchAllCollectionComponents(viewId);
       collectionsCache.value = markRaw(data);
 
-      localCategories.value = newItems.map((newCategory) => {
-        const existing = localCategories.value.find((category) => category.id === newCategory.id);
+      localCategories.value = newItems.map((newCategory: ReadonlyCollectionComponentGroup) => {
+        const existing = localCategories.value.find(
+          (category: ReadonlyCollectionComponentGroup) => category.id === newCategory.id,
+        );
         if (existing) {
           existing.title = newCategory.title || newCategory.id;
           return existing;
@@ -51,9 +64,9 @@ export function useModelCollections(viewId: string) {
 
   const selection = dataStyleStore.visibleMeshComponents(viewId);
 
-  async function updateVisibility(current: string[]) {
+  async function updateVisibility(current: readonly string[]): Promise<void> {
     const previous = selection.value;
-    const { added, removed } = compareSelections(current, previous);
+    const { added, removed } = compareSelections([...current], previous);
 
     if (added.length === 0 && removed.length === 0) {
       return;
@@ -65,7 +78,7 @@ export function useModelCollections(viewId: string) {
     if (removed.length > 0) {
       await dataStyleStore.setModelComponentsVisibility(viewId, removed, false);
     }
-    hybridViewerStore.remoteRender();
+    await hybridViewerStore.remoteRender();
   }
 
   return {
diff --git a/app/composables/model_components.ts b/app/composables/model_components.ts
index b439abd6..78c2ea60 100644
--- a/app/composables/model_components.ts
+++ b/app/composables/model_components.ts
@@ -1,15 +1,26 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { compareSelections } from "@ogw_front/utils/treeview";
-import { useDataStore } from "@ogw_front/stores/data";
-import { useDataStyleStore } from "@ogw_front/stores/data_style";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import type {
   FormattedComponent,
   FormattedComponentGroup,
 } from "@ogw_front/stores/data_helpers/mesh";
+import { compareSelections } from "@ogw_front/utils/treeview";
+import { useDataStore } from "@ogw_front/stores/data";
+import { useDataStyleStore } from "@ogw_front/stores/data_style";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+
+// The `watch` callback receives the freshly-fetched component groups purely for reading (matching against and copying into `localCategories`, never mutated in place), so it's typed with its own fully-readonly mirror of `FormattedComponentGroup` rather than that (intentionally mutable, see `existing.title` below) store type directly.
+interface ReadonlyFormattedComponentGroup {
+  readonly id: string;
+  readonly title: string;
+  readonly children: readonly FormattedComponent[];
+}
 
-export function useModelComponents(viewId: string) {
+export function useModelComponents(viewId: string): {
+  items: typeof items;
+  componentsCache: typeof componentsCache;
+  localCategories: typeof localCategories;
+  selection: typeof selection;
+  updateVisibility: typeof updateVisibility;
+} {
   const dataStore = useDataStore();
   const dataStyleStore = useDataStyleStore();
   const hybridViewerStore = useHybridViewerStore();
@@ -25,7 +36,7 @@ export function useModelComponents(viewId: string) {
 
   watch(
     items,
-    async (newItems) => {
+    async (newItems: readonly ReadonlyFormattedComponentGroup[] | undefined) => {
       if (!newItems) {
         localCategories.value = [];
         return;
@@ -34,8 +45,10 @@ export function useModelComponents(viewId: string) {
       const data = await dataStore.fetchAllMeshComponents(viewId);
       componentsCache.value = markRaw(data);
 
-      localCategories.value = newItems.map((newCategory) => {
-        const existing = localCategories.value.find((category) => category.id === newCategory.id);
+      localCategories.value = newItems.map((newCategory: ReadonlyFormattedComponentGroup) => {
+        const existing = localCategories.value.find(
+          (category: ReadonlyFormattedComponentGroup) => category.id === newCategory.id,
+        );
         if (existing) {
           existing.title = newCategory.title || newCategory.id;
           return existing;
@@ -51,9 +64,9 @@ export function useModelComponents(viewId: string) {
 
   const selection = dataStyleStore.visibleMeshComponents(viewId);
 
-  async function updateVisibility(current: string[]) {
+  async function updateVisibility(current: readonly string[]): Promise<void> {
     const previous = selection.value;
-    const { added, removed } = compareSelections(current, previous);
+    const { added, removed } = compareSelections([...current], previous);
 
     if (added.length === 0 && removed.length === 0) {
       return;
@@ -65,7 +78,7 @@ export function useModelComponents(viewId: string) {
     if (removed.length > 0) {
       await dataStyleStore.setModelComponentsVisibility(viewId, removed, false);
     }
-    hybridViewerStore.remoteRender();
+    await hybridViewerStore.remoteRender();
   }
 
   return {
diff --git a/app/composables/project_manager.ts b/app/composables/project_manager.ts
index 81aa3b6c..22be1448 100644
--- a/app/composables/project_manager.ts
+++ b/app/composables/project_manager.ts
@@ -2,18 +2,50 @@ import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.jso
 import fileDownload from "js-file-download";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
+import { type DataStyleSnapshot, useDataStyleStore } from "@ogw_front/stores/data_style";
+import { type NewDataItem, useDataStore } from "@ogw_front/stores/data";
+import { type TreeviewSnapshot, useTreeviewStore } from "@ogw_front/stores/treeview";
+import type { CameraSnapshot } from "@ogw_internal/stores/hybrid_viewer/camera";
+import type { ModelComponentRecord } from "@ogw_front/stores/data_helpers/mesh.js";
+import type { ModelComponentRelationRecord } from "@ogw_front/stores/data.js";
 import { fetchRaw } from "@ogw_shared/utils/fetch_raw";
 import { importWorkflowFromSnapshot } from "@ogw_front/utils/import_workflow";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useBackStore } from "@ogw_front/stores/back";
-import { useDataStore } from "@ogw_front/stores/data";
-import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import { useTreeviewStore } from "@ogw_front/stores/treeview";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
-async function exportProject() {
+interface ProjectDataSnapshot {
+  items: NewDataItem[];
+  modelComponents: ModelComponentRecord[];
+  modelComponentsRelations: ModelComponentRelationRecord[];
+}
+
+interface ProjectSnapshot {
+  treeview?: TreeviewSnapshot;
+  data?: ProjectDataSnapshot;
+  hybridViewer?: CameraSnapshot;
+  dataStyle?: DataStyleSnapshot;
+}
+
+// The backend response is an untyped network payload; this is the one place its shape is asserted.
+function isImportSnapshotResponse(value: unknown): value is { snapshot?: ProjectSnapshot } {
+  return typeof value === "object" && value !== null;
+}
+
+function isFileDownloadData(
+  value: unknown,
+): value is string | ArrayBuffer | ArrayBufferView | Blob {
+  return (
+    typeof value === "string" ||
+    value instanceof ArrayBuffer ||
+    ArrayBuffer.isView(value) ||
+    value instanceof Blob
+  );
+}
+
+async function exportProject(): Promise<{ result: unknown }> {
   console.log("[export triggered]");
   const appStore = useAppStore();
   const backStore = useBackStore();
@@ -29,12 +61,39 @@ async function exportProject() {
     baseURL: backStore.base_url,
   });
 
+  if (!isFileDownloadData(result)) {
+    throw new Error("Unexpected export_project response type");
+  }
   fileDownload(result, defaultName);
   feedbackStore.add_success("Project exported successfully");
   return { result };
 }
 
-async function importProject(file: File): Promise<void> {
+async function releaseViewerDatabase(
+  client: ReturnType<typeof useViewerStore>["client"],
+): Promise<void> {
+  if (
+    client !== undefined &&
+    client.getConnection !== undefined &&
+    client.getConnection().getSession !== undefined
+  ) {
+    await client.getConnection().getSession().call("opengeodeweb_viewer.release_database", [{}]);
+  }
+}
+
+async function importProjectToViewer(
+  client: ReturnType<typeof useViewerStore>["client"],
+): Promise<void> {
+  if (
+    client !== undefined &&
+    client.getConnection !== undefined &&
+    client.getConnection().getSession !== undefined
+  ) {
+    await client.getConnection().getSession().call("opengeodeweb_viewer.import_project", [{}]);
+  }
+}
+
+async function importProject(file: Readonly<File>): Promise<void> {
   const backStore = useBackStore();
   const dataStyleStore = useDataStyleStore();
   const viewerStore = useViewerStore();
@@ -44,21 +103,18 @@ async function importProject(file: File): Promise<void> {
 
   await viewerStore.ws_connect();
 
-  const { client } = viewerStore;
-  if (client && client.getConnection && client.getConnection().getSession) {
-    await client.getConnection().getSession().call("opengeodeweb_viewer.release_database", [{}]);
-  }
+  await releaseViewerDatabase(viewerStore.client);
   const resetVisualizationSchema = viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization;
   const timeout = undefined;
   await viewerStore.request({ schema: resetVisualizationSchema, timeout });
 
   treeviewStore.clear();
-  dataStore.clear();
+  await dataStore.clear();
   hybridViewerStore.clear();
 
   const importProjectSchema = back_schemas.opengeodeweb_back.import_project;
   const form = new FormData();
-  const originalFileName = file && file.name ? file.name : "project.vease";
+  const originalFileName = file.name.length > 0 ? file.name : "project.vease";
   if (!originalFileName.toLowerCase().endsWith(".vease")) {
     throw new Error("Uploaded file must be a .vease");
   }
@@ -70,23 +126,24 @@ async function importProject(file: File): Promise<void> {
     method: importProjectSchema.methods[0],
     baseURL: backStore.base_url,
   });
-  const snapshot = result && result.snapshot ? result.snapshot : {};
+  const snapshot = (isImportSnapshotResponse(result) ? result.snapshot : undefined) ?? {};
 
   treeviewStore.isImporting = true;
 
-  const { client: client2 } = viewerStore;
-  if (client2 && client2.getConnection && client2.getConnection().getSession) {
-    await client2.getConnection().getSession().call("opengeodeweb_viewer.import_project", [{}]);
-  }
+  await importProjectToViewer(viewerStore.client);
 
-  await treeviewStore.importStores(snapshot.treeview);
-  await dataStore.importStores(snapshot.data);
+  treeviewStore.importStores(snapshot.treeview);
+  if (snapshot.data !== undefined) {
+    await dataStore.importStores(snapshot.data);
+  }
   await hybridViewerStore.initHybridViewer();
 
-  const items = snapshot?.data?.items || [];
+  const items = snapshot.data?.items ?? [];
   await importWorkflowFromSnapshot(items);
   await hybridViewerStore.importStores(snapshot.hybridViewer);
-  await dataStyleStore.importStores(snapshot.dataStyle);
+  if (snapshot.dataStyle !== undefined) {
+    await dataStyleStore.importStores(snapshot.dataStyle);
+  }
   await dataStyleStore.applyAllStylesFromState();
 
   treeviewStore.finalizeImportSelection();
diff --git a/app/composables/responsive_middle_truncate.ts b/app/composables/responsive_middle_truncate.ts
index f3ce999f..4d8f38b6 100644
--- a/app/composables/responsive_middle_truncate.ts
+++ b/app/composables/responsive_middle_truncate.ts
@@ -1,7 +1,4 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { middleTruncate } from "@ogw_front/utils/string";
-import type { MaybeRefOrGetter } from "vue";
 
 const UUID_END_CHARS = 12;
 const ELLIPSIS_LENGTH = 3;
@@ -9,17 +6,20 @@ const MIN_START_CHARS = 4;
 const DEFAULT_ESTIMATED_CHAR_WIDTH = 8.5;
 
 interface ResponsiveMiddleTruncateOptions {
-  estimatedCharWidth?: number;
-  uuidEndChars?: number;
-  ellipsisLength?: number;
-  minStartChars?: number;
+  readonly estimatedCharWidth?: number;
+  readonly uuidEndChars?: number;
+  readonly ellipsisLength?: number;
+  readonly minStartChars?: number;
 }
 
+// Only the Ref member is wrapped in Readonly<>, so the callable getter member keeps a usable signature.
+type ReadonlyMaybeRefOrGetter<Value> = Value | Readonly<Ref<Value>> | (() => Value);
+
 export function useResponsiveMiddleTruncate(
-  textRef: MaybeRefOrGetter<string | undefined | null>,
-  containerWidthRef: MaybeRefOrGetter<number | undefined>,
-  options: ResponsiveMiddleTruncateOptions = {},
-) {
+  textRef: ReadonlyMaybeRefOrGetter<string | undefined | null>,
+  containerWidthRef: ReadonlyMaybeRefOrGetter<number | undefined>,
+  options: Readonly<ResponsiveMiddleTruncateOptions> = {},
+): ComputedRef<string> {
   const {
     estimatedCharWidth = DEFAULT_ESTIMATED_CHAR_WIDTH,
     uuidEndChars = UUID_END_CHARS,
@@ -29,11 +29,11 @@ export function useResponsiveMiddleTruncate(
 
   return computed(() => {
     const text = toValue(textRef);
-    if (!text) {
+    if (text === undefined || text === null || text === "") {
       return "";
     }
 
-    const width = toValue(containerWidthRef) || 0;
+    const width = toValue(containerWidthRef) ?? 0;
     const maxChars = Math.floor(width / estimatedCharWidth);
 
     if (maxChars <= 0 || text.length <= maxChars) {
@@ -43,6 +43,6 @@ export function useResponsiveMiddleTruncate(
     const endChars = Math.min(uuidEndChars, Math.floor(maxChars / ellipsisLength));
     const startChars = Math.max(minStartChars, maxChars - endChars - ellipsisLength);
 
-    return middleTruncate(text, maxChars, startChars, endChars);
+    return middleTruncate(text, maxChars, startChars, endChars) ?? "";
   });
 }
diff --git a/app/composables/stepper_tree.ts b/app/composables/stepper_tree.ts
index 4c14e540..7fa1e1d5 100644
--- a/app/composables/stepper_tree.ts
+++ b/app/composables/stepper_tree.ts
@@ -1,13 +1,36 @@
-export function useStepperTree(steps: unknown[], initial_state: Record<string, unknown> = {}) {
+interface StepperTreeApi {
+  state: Record<string, unknown>;
+  update_values: (keys_values_object: Readonly<Record<string, unknown>>) => void;
+  increment_step: () => void;
+  decrement_step: () => void;
+  reset_values: () => void;
+}
+
+function isUnknownArray(value: unknown): value is unknown[] {
+  return Array.isArray(value);
+}
+
+function get_current_step_index(state: Readonly<Record<string, unknown>>): number {
+  const value = state.current_step_index;
+  return typeof value === "number" ? value : 0;
+}
+
+function build_initial_state_unref(
+  initial_state: Readonly<Record<string, unknown>>,
+): Record<string, unknown> {
   const initial_state_unref: Record<string, unknown> = {};
   for (const [key, value] of Object.entries(initial_state)) {
-    const unref_val = unref(value);
-    if (Array.isArray(unref_val)) {
-      initial_state_unref[key] = [...unref_val];
-    } else {
-      initial_state_unref[key] = unref_val;
-    }
+    const unref_val: unknown = unref(value);
+    initial_state_unref[key] = isUnknownArray(unref_val) ? [...unref_val] : unref_val;
   }
+  return initial_state_unref;
+}
+
+export function useStepperTree(
+  steps: readonly unknown[],
+  initial_state: Readonly<Record<string, unknown>> = {},
+): StepperTreeApi {
+  const initial_state_unref = build_initial_state_unref(initial_state);
   const state = reactive<Record<string, unknown>>({
     current_step_index: 0,
     navigating_back: false,
@@ -16,7 +39,7 @@ export function useStepperTree(steps: unknown[], initial_state: Record<string, u
   });
 
   watch(
-    () => state.current_step_index as number,
+    () => get_current_step_index(state),
     (newVal, oldVal) => {
       if (newVal < oldVal) {
         state.navigating_back = true;
@@ -24,25 +47,25 @@ export function useStepperTree(steps: unknown[], initial_state: Record<string, u
     },
   );
 
-  function update_values(keys_values_object: Record<string, unknown>): void {
+  function update_values(keys_values_object: Readonly<Record<string, unknown>>): void {
     for (const [key, value] of Object.entries(keys_values_object)) {
       state[key] = value;
     }
   }
 
   function increment_step(): void {
-    (state.current_step_index as number) += 1;
+    state.current_step_index = get_current_step_index(state) + 1;
   }
 
   function decrement_step(): void {
-    (state.current_step_index as number) -= 1;
+    state.current_step_index = get_current_step_index(state) - 1;
   }
 
   function reset_values(): void {
     state.current_step_index = 0;
     state.navigating_back = false;
     for (const [key, initial_val] of Object.entries(initial_state_unref)) {
-      state[key] = Array.isArray(initial_val) ? [...initial_val] : initial_val;
+      state[key] = isUnknownArray(initial_val) ? [...initial_val] : initial_val;
     }
   }
 
diff --git a/app/composables/tree_filter.ts b/app/composables/tree_filter.ts
index c20ad27e..946589e9 100644
--- a/app/composables/tree_filter.ts
+++ b/app/composables/tree_filter.ts
@@ -1,20 +1,41 @@
-import type { MaybeRefOrGetter } from "vue";
+import type { Ref } from "vue";
+
+// Like Vue's MaybeRefOrGetter<T>, but the Ref branch is narrowed to Readonly<Ref<T>>: a plain
+// Ref<T> always fails prefer-readonly-parameter-types (its `.value` is writable) no matter how
+// Deeply readonly T itself is, and wrapping the *whole* union in Readonly<> instead would collapse
+// The getter-function branch to an uncallable `{}` (Readonly<Fn> has no keys). Callers passing an
+// Ordinary Ref<T> still type-check fine here: a mutable Ref<T> is assignable to Readonly<Ref<T>>.
+type ReadonlyMaybeRefOrGetter<Value> = Value | Readonly<Ref<Value>> | (() => Value);
 
 // This composable filters/sorts different flavors of "category with children" trees (treeview groups, model component/collection groups, ...); this shape captures just the fields it reads/writes, generically, across all of them.
 interface FilterableItem {
-  id: unknown;
-  title?: string;
-  children?: FilterableItem[];
+  readonly id: unknown;
+  readonly title?: string;
+  readonly children?: readonly FilterableItem[];
 }
 
 interface FilterContext {
-  raw?: FilterableItem;
+  readonly raw?: FilterableItem;
 }
 
 interface TreeFilterOptions {
-  recursiveSort?: boolean;
-  defaultSort?: string;
-  defaultFilters?: Record<string, boolean>;
+  readonly recursiveSort?: boolean;
+  readonly defaultSort?: string;
+  readonly defaultFilters?: Readonly<Record<string, boolean>>;
+}
+
+interface UseTreeFilterReturn {
+  search: Ref<string>;
+  sortType: Ref<string>;
+  filterOptions: Ref<Record<string, boolean>>;
+  processedItems: ComputedRef<FilterableItem[]>;
+  availableFilterOptions: ComputedRef<string[]>;
+  toggleSort: () => void;
+  customFilter: typeof customFilter;
+  applySearchFilter: (
+    newSelection: readonly unknown[],
+    previousSelection?: readonly unknown[],
+  ) => unknown[];
 }
 
 function customFilter(
@@ -22,37 +43,50 @@ function customFilter(
   searchQuery: string | undefined,
   item: FilterContext,
 ): boolean {
-  if (!searchQuery) {
+  if (searchQuery === undefined || searchQuery === "") {
     return true;
   }
-  if (!item || !item.raw) {
+  if (!item.raw) {
     return false;
   }
   const query = searchQuery.toLowerCase();
-  const { title = "", id = value } = item.raw || {};
+  const { title = "", id = value } = item.raw;
   return [title, id].some((field) => String(field).toLowerCase().includes(query));
 }
 
+// Extracted so we never call String() directly on a value typed as `unknown`/`any`.
+// The `id` field can be anything at runtime, so only stringify primitives that have a sane toString.
+// Anything else falls back to "" instead of risking "[object Object]".
+function toSortKey(item: FilterableItem, field: "title" | "id"): string {
+  const raw = item[field] ?? item.id ?? "";
+  if (typeof raw === "string" || typeof raw === "number" || typeof raw === "boolean") {
+    return String(raw);
+  }
+  return "";
+}
+
 function sortAndFormatItems(
-  itemList: FilterableItem[] | undefined | null,
+  itemList: readonly FilterableItem[] | undefined | null,
   sortType: string,
   options: TreeFilterOptions = {},
 ): FilterableItem[] {
-  if (!itemList || !Array.isArray(itemList)) {
+  if (!itemList) {
     return [];
   }
   const field: "title" | "id" = sortType === "name" ? "title" : "id";
   const localeOptions: Intl.CollatorOptions = { numeric: true, sensitivity: "base" };
 
-  const sorted = itemList
+  // Copy into a plain mutable array up front: chaining .filter()/.toSorted() straight off the
+  // Readonly-typed parameter (previously combined with an Array.isArray guard here) has been
+  // Observed to make oxlint's type-aware analysis silently widen the result to `any[]`.
+  const items: FilterableItem[] = [...itemList];
+  const sorted = items
     .filter((item) => item !== null && item !== undefined)
-    .toSorted((itemA, itemB) => {
-      const fieldA = String(itemA[field] || itemA.id || "");
-      const fieldB = String(itemB[field] || itemB.id || "");
-      return fieldA.localeCompare(fieldB, undefined, localeOptions);
-    });
+    .toSorted((itemA, itemB) =>
+      toSortKey(itemA, field).localeCompare(toSortKey(itemB, field), undefined, localeOptions),
+    );
 
-  if (options.recursiveSort) {
+  if (options.recursiveSort === true) {
     return sorted.map((item) => {
       if (item.children && item.children.length > 0) {
         return {
@@ -67,39 +101,31 @@ function sortAndFormatItems(
 }
 
 function useTreeFilter(
-  itemsIn: MaybeRefOrGetter<FilterableItem[]>,
+  itemsIn: ReadonlyMaybeRefOrGetter<readonly FilterableItem[]>,
   options: TreeFilterOptions = {},
-) {
+): UseTreeFilterReturn {
   const rawItems = typeof itemsIn === "function" ? computed(itemsIn) : toRef(itemsIn);
   const search = ref("");
-  const sortType = ref(options.defaultSort || "name");
-  const filterOptions = ref<Record<string, boolean>>(options.defaultFilters || {});
+  const sortType = ref(options.defaultSort ?? "name");
+  const filterOptions = ref<Record<string, boolean>>({ ...options.defaultFilters });
 
-  const availableFilterOptions = computed(() => {
-    if (!rawItems.value) {
-      return [];
-    }
-    return rawItems.value.map((category) => String(category.title || category.id));
-  });
+  const availableFilterOptions = computed(() =>
+    rawItems.value.map((category) => String(category.title ?? category.id)),
+  );
 
   watch(
     availableFilterOptions,
-    (newOptions) => {
+    (newOptions: readonly string[]) => {
       for (const option of newOptions) {
-        if (filterOptions.value[option] === undefined) {
-          filterOptions.value[option] = true;
-        }
+        filterOptions.value[option] ??= true;
       }
     },
     { immediate: true },
   );
 
   const processedItems = computed(() => {
-    if (!rawItems.value) {
-      return [];
-    }
     const filteredByCategory = rawItems.value.filter((category) => {
-      const key = String(category.title || category.id);
+      const key = String(category.title ?? category.id);
       return filterOptions.value[key] !== false;
     });
 
@@ -111,7 +137,7 @@ function useTreeFilter(
 
     const result: FilterableItem[] = [];
     for (const category of sorted) {
-      const children = (category.children || []).filter((child) =>
+      const children = (category.children ?? []).filter((child) =>
         customFilter(child.id, search.value, { raw: child }),
       );
       if (children.length > 0 || customFilter(category.id, search.value, { raw: category })) {
@@ -127,7 +153,7 @@ function useTreeFilter(
 
   const allItems = computed(() => {
     const map = new Map<unknown, FilterableItem>();
-    function traverse(items: FilterableItem[]): void {
+    function traverse(items: readonly FilterableItem[]): void {
       for (const item of items) {
         map.set(item.id, item);
         if (item.children) {
@@ -135,16 +161,16 @@ function useTreeFilter(
         }
       }
     }
-    traverse(rawItems.value || []);
+    traverse(rawItems.value);
     return map;
   });
 
   function applySearchFilter(
-    newSelection: unknown[],
-    previousSelection: unknown[] = [],
+    newSelection: readonly unknown[],
+    previousSelection: readonly unknown[] = [],
   ): unknown[] {
     if (!search.value) {
-      return newSelection;
+      return [...newSelection];
     }
     const allItemsMap = allItems.value;
     function matches(id: unknown): boolean {
diff --git a/app/composables/tree_keyboard_nav.ts b/app/composables/tree_keyboard_nav.ts
index 7735f277..378e0e3c 100644
--- a/app/composables/tree_keyboard_nav.ts
+++ b/app/composables/tree_keyboard_nav.ts
@@ -1,6 +1,3 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { Ref } from "vue";
 import type { DisplayItem, EmitFn } from "./virtual_tree";
 
 interface VisibleBounds {
@@ -14,10 +11,24 @@ interface ScrollInfo {
   itemHeight: number;
 }
 
+type ReadonlyDisplayItem = Readonly<Omit<DisplayItem, "raw">> & {
+  readonly raw: Readonly<Record<string, unknown>>;
+};
+
+interface KeyboardEventLike {
+  readonly key: string;
+  preventDefault: () => void;
+}
+
+interface UseTreeKeyboardNavReturn {
+  focusedIndex: Ref<number>;
+  handleKeyDown: (event: Readonly<KeyboardEventLike>) => void;
+}
+
 function getBaseIndex(
   currentIndex: number,
   lastIndex: number,
-  bounds: VisibleBounds | undefined,
+  bounds: Readonly<VisibleBounds> | undefined,
   key: string,
 ): number {
   if (currentIndex < 0 || currentIndex > lastIndex) {
@@ -38,17 +49,17 @@ function getBaseIndex(
 }
 
 export function useTreeKeyboardNav(
-  displayItems: Ref<DisplayItem[]>,
+  displayItems: Readonly<Ref<readonly ReadonlyDisplayItem[]>>,
   emit: EmitFn,
   scrollToIndex: (index: number) => void,
-  toggleOpen: (raw: Record<string, unknown>) => void,
-  handleItemClick: (item: DisplayItem, index: number) => void,
+  toggleOpen: (raw: Readonly<Record<string, unknown>>) => void,
+  handleItemClick: (item: ReadonlyDisplayItem, index: number) => void,
   getScrollInfo: (() => ScrollInfo | undefined) | undefined,
-  externalFocusedIndex: Ref<number> | undefined,
-) {
-  const focusedIndex = externalFocusedIndex || ref(-1);
+  externalFocusedIndex: Readonly<Ref<number>> | undefined,
+): UseTreeKeyboardNavReturn {
+  const focusedIndex = externalFocusedIndex ?? ref(-1);
 
-  function findParentIndex(item: DisplayItem, currentIndex: number): number {
+  function findParentIndex(item: ReadonlyDisplayItem, currentIndex: number): number {
     for (let index = currentIndex - 1; index >= 0; index -= 1) {
       const candidate = displayItems.value[index];
       if (candidate && candidate.depth < item.depth) {
@@ -74,7 +85,7 @@ export function useTreeKeyboardNav(
   }
 
   function handleExpandOrNext(
-    item: DisplayItem | undefined,
+    item: ReadonlyDisplayItem | undefined,
     currentIndex: number,
     lastIndex: number,
   ): number {
@@ -85,7 +96,10 @@ export function useTreeKeyboardNav(
     return Math.min(currentIndex + 1, lastIndex);
   }
 
-  function handleCollapseOrParent(item: DisplayItem | undefined, currentIndex: number): number {
+  function handleCollapseOrParent(
+    item: ReadonlyDisplayItem | undefined,
+    currentIndex: number,
+  ): number {
     if (item && !item.isLeaf && item.isOpen) {
       toggleOpen(item.raw);
       return currentIndex;
@@ -129,7 +143,7 @@ export function useTreeKeyboardNav(
     return currentIndex;
   }
 
-  function handleKeyDown(event: KeyboardEvent): void {
+  function handleKeyDown(event: Readonly<KeyboardEventLike>): void {
     if (displayItems.value.length === 0) {
       return;
     }
@@ -137,7 +151,7 @@ export function useTreeKeyboardNav(
     if (["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) {
       event.preventDefault();
       const prevIndex = focusedIndex.value;
-      focusedIndex.value = getNextIndex(event.key);
+      (focusedIndex as Ref<number>).value = getNextIndex(event.key);
 
       if (focusedIndex.value !== prevIndex) {
         if (prevIndex >= 0 && prevIndex < displayItems.value.length) {
diff --git a/app/composables/tree_scroll.ts b/app/composables/tree_scroll.ts
index 3a818b7f..723db1b2 100644
--- a/app/composables/tree_scroll.ts
+++ b/app/composables/tree_scroll.ts
@@ -1,6 +1,3 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { MaybeRefOrGetter, Ref } from "vue";
 import type { DisplayItem, EmitFn, ItemPropsConfig } from "./virtual_tree";
 
 interface TreeScrollProps {
@@ -8,24 +5,57 @@ interface TreeScrollProps {
 }
 
 interface ScrollableElement {
-  $el: { scrollTop: number; clientHeight: number };
+  $el: { scrollTop: number; clientHeight: number } | undefined;
+}
+
+interface ScrollInfo {
+  scrollTop: number;
+  containerHeight: number;
+  itemHeight: number;
+}
+
+type ReadonlyMaybeRefOrGetter<Value> = Value | Readonly<Ref<Value>> | (() => Value);
+
+type ReadonlyDisplayItem = Readonly<Omit<DisplayItem, "raw">> & {
+  readonly raw: Readonly<Record<string, unknown>>;
+};
+
+interface ScrollEventLike {
+  readonly target: Readonly<EventTarget> | null;
+}
+
+interface UseTreeScrollReturn {
+  internalScrollTop: Ref<number>;
+  virtualScrollRef: Ref<ScrollableElement | undefined>;
+  stickyHeader: ComputedRef<ReadonlyDisplayItem | undefined>;
+  handleScroll: (event: Readonly<ScrollEventLike>) => void;
+  scrollToIndex: (index: number) => void;
+  getScrollInfo: () => ScrollInfo;
+}
+
+function isHtmlElement(value: Readonly<EventTarget> | null): value is HTMLElement {
+  return value instanceof HTMLElement;
 }
 
 export function useTreeScroll(
-  propsIn: MaybeRefOrGetter<TreeScrollProps>,
+  propsIn: ReadonlyMaybeRefOrGetter<Readonly<TreeScrollProps>>,
   emit: EmitFn,
-  displayItems: Ref<DisplayItem[]>,
-  actualItemProps: Ref<ItemPropsConfig>,
-) {
+  displayItems: Readonly<Ref<readonly ReadonlyDisplayItem[]>>,
+  actualItemProps: Readonly<Ref<Readonly<ItemPropsConfig>>>,
+): UseTreeScrollReturn {
   const SCROLL_STICKY_THRESHOLD = 10;
   const DEFAULT_ITEM_HEIGHT = 28;
 
   const props = toRef(propsIn);
-  const internalScrollTop = ref(props.value.scrollTop || 0);
+  const internalScrollTop = ref(props.value.scrollTop ?? 0);
   const virtualScrollRef = ref<ScrollableElement | undefined>(undefined);
 
-  function handleScroll(event: Event): void {
-    const { scrollTop } = event.target as HTMLElement;
+  function handleScroll(event: Readonly<ScrollEventLike>): void {
+    const { target } = event;
+    if (!isHtmlElement(target)) {
+      return;
+    }
+    const { scrollTop } = target;
     internalScrollTop.value = scrollTop;
     emit("update:scrollTop", scrollTop);
   }
@@ -35,7 +65,7 @@ export function useTreeScroll(
     (newVal = 0) => {
       if (Math.abs(newVal - internalScrollTop.value) > 1) {
         internalScrollTop.value = newVal;
-        if (virtualScrollRef.value && virtualScrollRef.value.$el) {
+        if (virtualScrollRef.value !== undefined && virtualScrollRef.value.$el !== undefined) {
           virtualScrollRef.value.$el.scrollTop = newVal;
         }
       }
@@ -76,12 +106,12 @@ export function useTreeScroll(
   });
 
   function scrollToIndex(index: number): void {
-    if (index === -1 || !virtualScrollRef.value) {
+    if (index === -1 || virtualScrollRef.value === undefined) {
       return;
     }
 
     const container = virtualScrollRef.value.$el;
-    if (!container) {
+    if (container === undefined) {
       return;
     }
 
@@ -100,7 +130,7 @@ export function useTreeScroll(
     }
   }
 
-  function getScrollInfo() {
+  function getScrollInfo(): ScrollInfo {
     const container = virtualScrollRef.value?.$el;
     const containerHeight = container ? container.clientHeight : 0;
     const itemHeight = actualItemProps.value?.height || DEFAULT_ITEM_HEIGHT;
diff --git a/app/composables/use_adaptive_styles.ts b/app/composables/use_adaptive_styles.ts
index 27a189bd..dea34682 100644
--- a/app/composables/use_adaptive_styles.ts
+++ b/app/composables/use_adaptive_styles.ts
@@ -1,3 +1,4 @@
+import type { MaybeComputedElementRef } from "@vueuse/core";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
 
@@ -29,45 +30,72 @@ interface CoordinatesLike {
   height?: unknown;
 }
 
+interface RefLike {
+  value?: unknown;
+  x?: unknown;
+}
+
+function isRefLike(value: unknown): value is RefLike {
+  return typeof value === "object" && value !== null;
+}
+
+function isCoordinatesGetter(value: unknown): value is () => CoordinatesLike | undefined {
+  return typeof value === "function";
+}
+
+function isCoordinatesLike(value: unknown): value is CoordinatesLike {
+  return typeof value === "object" && value !== null;
+}
+
 function getValue(val: unknown): number {
   if (typeof val === "object" && val !== null && "value" in val) {
     const wrapped = (val as { value?: unknown }).value;
-    if (wrapped !== undefined) {
-      return wrapped as number;
+    if (typeof wrapped === "number") {
+      return wrapped;
     }
   }
-  return (val as number | undefined) ?? 0;
+  return typeof val === "number" ? val : 0;
 }
 
 // oxlint-disable max-lines-per-function
 export function useAdaptiveStyles(
   target: AdaptiveStylesTarget,
-  options: AdaptiveStylesOptions = {},
-) {
+  options: Readonly<AdaptiveStylesOptions> = {},
+): {
+  adaptiveStyles: ComputedRef<{
+    "--adaptive-blur": string;
+    "--adaptive-opacity": number;
+    "--adaptive-brightness": number;
+  }>;
+  brightness: Ref<number>;
+} {
   const hybridViewerStore = useHybridViewerStore();
   const treeviewStore = useTreeviewStore();
 
-  const targetAsRefLike = target as { value?: unknown; x?: unknown } | undefined;
-  const isCoordinates = Boolean(
-    target &&
+  const targetAsRefLike = isRefLike(target) ? target : undefined;
+  const isCoordinates =
+    target !== undefined &&
+    target !== null &&
     (typeof target === "function" ||
       (targetAsRefLike?.value !== undefined &&
         targetAsRefLike.value !== null &&
         (targetAsRefLike.value as { x?: unknown }).x !== undefined) ||
-      (targetAsRefLike?.x !== undefined && targetAsRefLike.value === undefined)),
-  );
+      (targetAsRefLike?.x !== undefined && targetAsRefLike.value === undefined));
 
-  const bounding = useElementBounding(isCoordinates ? undefined : (target as never));
+  const bounding = useElementBounding(
+    // oxlint-disable-next-line no-unsafe-type-assertion -- duck-typed target; see comment above.
+    isCoordinates ? undefined : (target as MaybeComputedElementRef),
+  );
 
   const unwrapped = computed(() => {
     if (isCoordinates) {
       let val: CoordinatesLike | undefined = undefined;
-      if (typeof target === "function") {
-        val = (target as () => CoordinatesLike | undefined)();
+      if (isCoordinatesGetter(target)) {
+        val = target();
       } else if (targetAsRefLike?.value === undefined) {
         val = targetAsRefLike;
-      } else {
-        val = targetAsRefLike.value as CoordinatesLike | undefined;
+      } else if (isCoordinatesLike(targetAsRefLike.value)) {
+        val = targetAsRefLike.value;
       }
       return {
         x: getValue(val?.x),
@@ -91,7 +119,7 @@ export function useAdaptiveStyles(
 
   const brightness = ref(LUMINANCE_THRESHOLD);
 
-  function calculateBrightness() {
+  function calculateBrightness(): void {
     brightness.value = hybridViewerStore.getAverageBrightness({
       x: x.value,
       y: y.value,
@@ -102,19 +130,33 @@ export function useAdaptiveStyles(
 
   const updateBrightness = useThrottleFn(calculateBrightness, ADAPTIVE_REFRESH_RATE);
 
-  watch([x, y, width, height, () => hybridViewerStore.latestImage], updateBrightness, {
-    immediate: true,
-  });
+  watch(
+    [
+      x,
+      y,
+      width,
+      height,
+      (): typeof hybridViewerStore.latestImage => hybridViewerStore.latestImage,
+    ],
+    updateBrightness,
+    {
+      immediate: true,
+    },
+  );
 
-  async function forceRefresh() {
+  async function forceRefresh(): Promise<void> {
     await nextTick();
     bounding.update?.();
     calculateBrightness();
   }
 
   if (getCurrentInstance()) {
-    onMounted(() => {
-      forceRefresh();
+    onMounted(async () => {
+      try {
+        await forceRefresh();
+      } catch (error) {
+        console.error("forceRefresh failed:", error);
+      }
     });
   }
 
diff --git a/app/composables/use_overlapping_picker.ts b/app/composables/use_overlapping_picker.ts
index c530c5d2..477dc7f8 100644
--- a/app/composables/use_overlapping_picker.ts
+++ b/app/composables/use_overlapping_picker.ts
@@ -1,17 +1,18 @@
 import { ref } from "vue";
-import { useDataStore } from "@ogw_front/stores/data";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+
+import { type DataItem, useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 interface PickedItem {
   id: string;
-  viewer_id: number;
+  viewer_id: number | undefined;
 }
 
 interface ProposedItem {
   id: string;
-  viewer_id: number;
+  viewer_id: number | undefined;
   name: string;
   viewer_type: string | undefined;
   geode_object_type: string | undefined;
@@ -19,7 +20,7 @@ interface ProposedItem {
 
 interface PickedResponse {
   array_ids: string[];
-  viewer_id: number;
+  viewer_id: number | null;
   picked_data?: PickedItem[];
 }
 
@@ -33,10 +34,58 @@ interface GetViewerIdParams {
   y: number;
   containerWidth: number;
   containerHeight: number;
-  containerRect: { left: number; top: number };
+  containerRect: Readonly<{ left: number; top: number }>;
+}
+
+interface UseOverlappingPickerReturn {
+  displayIntermediate: Ref<boolean>;
+  intermediateItems: Ref<ProposedItem[]>;
+  intermediateMenuX: Ref<number>;
+  intermediateMenuY: Ref<number>;
+  getIntermediateMenuStyle: () => { position: string; left: string; top: string };
+  selectIntermediateItem: (item: Readonly<ProposedItem> | undefined) => void;
+  handleIntermediateMenuUpdate: (val: boolean) => void;
+  get_viewer_id: (params: Readonly<GetViewerIdParams>) => Promise<ViewerIdResult>;
+}
+
+function isPickedItem(entry: unknown): entry is PickedItem {
+  return (
+    typeof entry === "object" &&
+    entry !== null &&
+    "id" in entry &&
+    typeof entry.id === "string" &&
+    (!("viewer_id" in entry) ||
+      entry.viewer_id === undefined ||
+      typeof entry.viewer_id === "number")
+  );
+}
+
+function isPickedItemArray(value: unknown): value is PickedItem[] {
+  return Array.isArray(value) && value.every((entry) => isPickedItem(entry));
+}
+
+function isPickedResponse(value: unknown): value is PickedResponse {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  if (!("array_ids" in value) || !("viewer_id" in value)) {
+    return false;
+  }
+  const { array_ids, viewer_id } = value;
+  if (
+    !Array.isArray(array_ids) ||
+    !array_ids.every((entry) => typeof entry === "string") ||
+    (typeof viewer_id !== "number" && viewer_id !== null)
+  ) {
+    return false;
+  }
+  if ("picked_data" in value) {
+    return value.picked_data === undefined || isPickedItemArray(value.picked_data);
+  }
+  return true;
 }
 
-export function useOverlappingPicker() {
+export function useOverlappingPicker(): UseOverlappingPickerReturn {
   const dataStore = useDataStore();
   const dataStyleStore = useDataStyleStore();
   const viewerStore = useViewerStore();
@@ -46,11 +95,14 @@ export function useOverlappingPicker() {
   const intermediateItems = ref<ProposedItem[]>([]);
   const intermediateMenuX = ref(0);
   const intermediateMenuY = ref(0);
-  let resolveIntermediate: ((item: ProposedItem | undefined) => void) | undefined = undefined;
+  let resolveIntermediate: ((item: Readonly<ProposedItem> | undefined) => void) | undefined =
+    undefined;
 
-  function fetchProposedItems(pickedList: PickedItem[]): Promise<ProposedItem[]> {
-    return Promise.all(
-      pickedList.map(async (pick) => {
+  async function fetchProposedItems(
+    pickedList: readonly Readonly<PickedItem>[],
+  ): Promise<ProposedItem[]> {
+    const proposedItems = await Promise.all(
+      pickedList.map(async (pick: Readonly<PickedItem>) => {
         try {
           const item = await dataStore.item(pick.id);
           return {
@@ -71,9 +123,10 @@ export function useOverlappingPicker() {
         }
       }),
     );
+    return proposedItems;
   }
 
-  function getIntermediateMenuStyle() {
+  function getIntermediateMenuStyle(): { position: string; left: string; top: string } {
     return {
       position: "fixed",
       left: `${intermediateMenuX.value}px`,
@@ -81,7 +134,7 @@ export function useOverlappingPicker() {
     };
   }
 
-  function selectIntermediateItem(item: ProposedItem | undefined): void {
+  function selectIntermediateItem(item: Readonly<ProposedItem> | undefined): void {
     if (resolveIntermediate) {
       resolveIntermediate(item);
       resolveIntermediate = undefined;
@@ -101,10 +154,10 @@ export function useOverlappingPicker() {
     containerWidth,
     containerHeight,
     containerRect,
-  }: GetViewerIdParams): Promise<ViewerIdResult> {
-    const activeIds = new Set(dataItems.value.map((i) => i.id));
+  }: Readonly<GetViewerIdParams>): Promise<ViewerIdResult> {
+    const activeIds = new Set(dataItems.value.map((i: Readonly<DataItem>) => i.id));
     const visibleStyleIds = Object.keys(dataStyleStore.styles).filter(
-      (styleId) => activeIds.has(styleId) && dataStyleStore.objectVisibility(styleId),
+      (styleId) => activeIds.has(styleId) && dataStyleStore.objectVisibility(styleId) === true,
     );
 
     const viewableChecks = await Promise.all(
@@ -134,13 +187,13 @@ export function useOverlappingPicker() {
       },
       {
         response_function: (response: unknown) => {
-          responseHolder.pickedResponse = response as PickedResponse;
+          responseHolder.pickedResponse = isPickedResponse(response) ? response : undefined;
         },
       },
     );
     const { pickedResponse } = responseHolder;
 
-    if (!pickedResponse || !pickedResponse.array_ids || pickedResponse.array_ids.length === 0) {
+    if (!pickedResponse || pickedResponse.array_ids.length === 0) {
       return result;
     }
 
@@ -151,7 +204,7 @@ export function useOverlappingPicker() {
       pickedList.push(...picked_data);
     } else {
       for (const pickId of array_ids) {
-        pickedList.push({ id: pickId, viewer_id });
+        pickedList.push({ id: pickId, viewer_id: viewer_id ?? undefined });
       }
     }
 
@@ -189,7 +242,7 @@ export function useOverlappingPicker() {
 
     /* eslint-disable-next-line promise/avoid-new */
     return new Promise<ViewerIdResult>((resolve) => {
-      resolveIntermediate = (chosenResult) => {
+      resolveIntermediate = (chosenResult: Readonly<ProposedItem> | undefined): void => {
         displayIntermediate.value = false;
         resolve(
           chosenResult
diff --git a/app/composables/use_quick_colormap.ts b/app/composables/use_quick_colormap.ts
index 40e7930c..a0ddf7e2 100644
--- a/app/composables/use_quick_colormap.ts
+++ b/app/composables/use_quick_colormap.ts
@@ -1,7 +1,20 @@
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
-export function useQuickColormap() {
+// Runtime guard for the unknown response of viewerStore.request(), used instead of an
+// `as` cast so the shape is actually verified (data_id, when present, must be a string).
+function isPickColormapResult(value: unknown): value is { data_id?: string } {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    (!("data_id" in value) || typeof value.data_id === "string")
+  );
+}
+
+export function useQuickColormap(): {
+  pickColormap: typeof pickColormap;
+  quickColormap: typeof quickColormap;
+} {
   const viewerStore = useViewerStore();
   const quickColormap = reactive<{
     data_id: string | undefined;
@@ -24,10 +37,8 @@ export function useQuickColormap() {
     try {
       const schema = viewer_schemas.opengeodeweb_viewer.viewer.pick_colormap;
       const params = { x: offsetX, y: offsetY };
-      const result = (await viewerStore.request({ schema, params })) as
-        | { data_id?: string }
-        | undefined;
-      if (result && result.data_id) {
+      const result = await viewerStore.request({ schema, params });
+      if (isPickColormapResult(result) && result.data_id !== undefined && result.data_id !== "") {
         quickColormap.data_id = result.data_id;
         quickColormap.x = clientX;
         quickColormap.y = clientY;
diff --git a/app/composables/virtual_tree.ts b/app/composables/virtual_tree.ts
index b568ddad..6bcc37dc 100644
--- a/app/composables/virtual_tree.ts
+++ b/app/composables/virtual_tree.ts
@@ -1,6 +1,13 @@
-import type { MaybeRefOrGetter } from "vue";
+import type { Ref } from "vue";
 
-type TreeItem = Record<string, unknown>;
+// Like Vue's MaybeRefOrGetter<T>, but the Ref branch is narrowed to Readonly<Ref<T>>: a plain
+// Ref<T> always fails prefer-readonly-parameter-types (its `.value` is writable) no matter how
+// Deeply readonly T itself is, and wrapping the *whole* union in Readonly<> instead would collapse
+// The getter-function branch to an uncallable `{}` (Readonly<Fn> has no keys). Callers passing an
+// Ordinary Ref<T> still type-check fine here: a mutable Ref<T> is assignable to Readonly<Ref<T>>.
+type ReadonlyMaybeRefOrGetter<Value> = Value | Readonly<Ref<Value>> | (() => Value);
+
+type TreeItem = Readonly<Record<string, unknown>>;
 
 interface ItemPropsConfig {
   value: string;
@@ -17,14 +24,18 @@ interface SelectionConfig {
 }
 
 interface VirtualTreeProps {
-  items?: TreeItem[];
-  opened?: unknown[];
-  selected?: unknown[];
-  active?: unknown[];
-  itemProps?: Partial<ItemPropsConfig>;
-  selection?: Partial<SelectionConfig>;
-  search?: string;
-  customFilter?: (id: unknown, search: string, context: { raw: TreeItem }) => boolean;
+  readonly items?: readonly TreeItem[];
+  readonly opened?: readonly unknown[];
+  readonly selected?: readonly unknown[];
+  readonly active?: readonly unknown[];
+  readonly itemProps?: Readonly<Partial<ItemPropsConfig>>;
+  readonly selection?: Readonly<Partial<SelectionConfig>>;
+  readonly search?: string;
+  readonly customFilter?: (
+    id: unknown,
+    search: string,
+    context: Readonly<{ raw: TreeItem }>,
+  ) => boolean;
 }
 
 interface DisplayItem {
@@ -36,9 +47,39 @@ interface DisplayItem {
   isLeaf: boolean;
 }
 
-type EmitFn = (event: string, ...args: unknown[]) => void;
+type EmitFn = (event: string, ...args: readonly unknown[]) => void;
+
+interface UseVirtualTreeReturn {
+  actualItemProps: ComputedRef<ItemPropsConfig>;
+  actualSelection: ComputedRef<SelectionConfig>;
+  displayItems: ComputedRef<DisplayItem[]>;
+  toggleOpen: (item: TreeItem) => void;
+  toggleSelect: (item: TreeItem) => void;
+  isSelected: (item: TreeItem) => boolean;
+  getIndeterminate: (item: TreeItem) => boolean;
+}
+
+// Real runtime check (rather than an `as TreeItem[]` cast) for the duck-typed "children" field:
+// Item shapes vary across callers (treeview groups, model component/collection groups, ...), so
+// This only verifies it is actually an array, same as the assumption the old cast silently made.
+function isTreeItemArray(value: unknown): value is TreeItem[] {
+  return Array.isArray(value);
+}
+
+// Extracted so we never call String() directly on a value typed as `unknown` (ids and titles can
+// Be anything at runtime): only stringify primitives that have a sane toString, and fall back to
+// "" for anything else instead of risking "[object Object]".
+function toDisplayString(value: unknown): string {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return "";
+}
 
-function useVirtualTree(propsIn: MaybeRefOrGetter<VirtualTreeProps>, emit: EmitFn) {
+function useVirtualTree(
+  propsIn: ReadonlyMaybeRefOrGetter<VirtualTreeProps>,
+  emit: EmitFn,
+): UseVirtualTreeReturn {
   const props = toRef(propsIn);
 
   const actualItemProps = computed<ItemPropsConfig>(() => ({
@@ -57,7 +98,7 @@ function useVirtualTree(propsIn: MaybeRefOrGetter<VirtualTreeProps>, emit: EmitF
 
   const openedSet = computed(() => new Set(props.value.opened));
   const selectedSet = computed(() => new Set(props.value.selected));
-  const activeSet = computed(() => new Set(props.value.active || []));
+  const activeSet = computed(() => new Set(props.value.active));
 
   function toggleOpen(item: TreeItem): void {
     const id = item[actualItemProps.value.value];
@@ -71,16 +112,17 @@ function useVirtualTree(propsIn: MaybeRefOrGetter<VirtualTreeProps>, emit: EmitF
     emit("update:opened", [...newOpened]);
   }
 
-  function getLeafChildrenIds(item: TreeItem, ids: unknown[] = []): unknown[] {
-    const children = item[actualItemProps.value.children] as TreeItem[] | undefined;
+  function getChildrenOf(item: TreeItem): TreeItem[] | undefined {
+    const rawChildren = item[actualItemProps.value.children];
+    return isTreeItemArray(rawChildren) ? rawChildren : undefined;
+  }
+
+  function getLeafChildrenIds(item: TreeItem): unknown[] {
+    const children = getChildrenOf(item);
     if (children) {
-      for (const child of children) {
-        getLeafChildrenIds(child, ids);
-      }
-    } else {
-      ids.push(item[actualItemProps.value.value]);
+      return children.flatMap((child) => getLeafChildrenIds(child));
     }
-    return ids;
+    return [item[actualItemProps.value.value]];
   }
 
   function isSelected(item: TreeItem): boolean {
@@ -137,32 +179,28 @@ function useVirtualTree(propsIn: MaybeRefOrGetter<VirtualTreeProps>, emit: EmitF
     emit("update:selected", [...newSelected]);
   }
 
-  function flattenTree(
-    itemsList: TreeItem[],
-    depth = 0,
-    result: DisplayItem[] = [],
-  ): DisplayItem[] {
+  function flattenTree(itemsList: readonly TreeItem[], depth = 0): DisplayItem[] {
     const { search, customFilter } = props.value;
-    const lowerSearch = search ? search.toLowerCase() : "";
+    const result: DisplayItem[] = [];
 
     for (const item of itemsList) {
       const id = item[actualItemProps.value.value];
-      const children = item[actualItemProps.value.children] as TreeItem[] | undefined;
+      const children = getChildrenOf(item);
       const hasChildren = Boolean(children && children.length > 0);
 
       const isOpen = openedSet.value.has(id);
       const isActive = activeSet.value.has(id);
 
-      if (lowerSearch) {
+      if (search !== undefined && search !== "") {
+        const lowerSearch = search.toLowerCase();
         const matches = customFilter
-          ? customFilter(id, search as string, { raw: item })
-          : String(item[actualItemProps.value.title] ?? "")
+          ? customFilter(id, search, { raw: item })
+          : toDisplayString(item[actualItemProps.value.title])
               .toLowerCase()
-              .includes(lowerSearch) || String(id).toLowerCase().includes(lowerSearch);
+              .includes(lowerSearch) || toDisplayString(id).toLowerCase().includes(lowerSearch);
 
         if (hasChildren) {
-          const subtree: DisplayItem[] = [];
-          flattenTree(children ?? [], depth + 1, subtree);
+          const subtree = flattenTree(children ?? [], depth + 1);
           if (subtree.length === 0 && !matches) {
             continue;
           }
@@ -195,31 +233,33 @@ function useVirtualTree(propsIn: MaybeRefOrGetter<VirtualTreeProps>, emit: EmitF
       });
 
       if (isOpen && hasChildren) {
-        flattenTree(children ?? [], depth + 1, result);
+        result.push(...flattenTree(children ?? [], depth + 1));
       }
     }
     return result;
   }
 
-  function traverse(itemsList: TreeItem[], allIds: unknown[]): void {
+  function collectNonLeafIds(itemsList: readonly TreeItem[]): unknown[] {
+    const allIds: unknown[] = [];
     for (const item of itemsList) {
-      const children = item[actualItemProps.value.children] as TreeItem[] | undefined;
+      const children = getChildrenOf(item);
       if (children && children.length > 0) {
-        allIds.push(item[actualItemProps.value.value]);
-        traverse(children, allIds);
+        allIds.push(item[actualItemProps.value.value], ...collectNonLeafIds(children));
       }
     }
+    return allIds;
   }
 
-  const displayItems = computed(() => flattenTree(props.value.items || []));
+  const displayItems = computed(() => flattenTree(props.value.items ?? []));
 
   watch(
     () => props.value.search,
     (newSearch, oldSearch) => {
-      if (newSearch && !oldSearch) {
-        const allIds: unknown[] = [];
-        traverse(props.value.items || [], allIds);
-        emit("update:opened", [...new Set([...(props.value.opened || []), ...allIds])]);
+      const hasNewSearch = newSearch !== undefined && newSearch !== "";
+      const hadOldSearch = oldSearch !== undefined && oldSearch !== "";
+      if (hasNewSearch && !hadOldSearch) {
+        const allIds = collectNonLeafIds(props.value.items ?? []);
+        emit("update:opened", [...new Set([...(props.value.opened ?? []), ...allIds])]);
       }
     },
   );
diff --git a/app/composables/vtk_implicit_plane_widget.d.ts b/app/composables/vtk_implicit_plane_widget.d.ts
new file mode 100644
index 00000000..333bfedd
--- /dev/null
+++ b/app/composables/vtk_implicit_plane_widget.d.ts
@@ -0,0 +1,2 @@
+// Vtk.js does not ship type declarations for this widget module.
+declare module "@kitware/vtk.js/Widgets/Widgets3D/ImplicitPlaneWidget";
diff --git a/app/plugins/auto_store_register.ts b/app/plugins/auto_store_register.ts
index e65dc8a1..b86acafb 100644
--- a/app/plugins/auto_store_register.ts
+++ b/app/plugins/auto_store_register.ts
@@ -1,16 +1,13 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { useAppStore } from "@ogw_front/stores/app";
 import type { PiniaPluginContext } from "pinia";
+import { useAppStore } from "@ogw_front/stores/app";
 
-function autoStoreRegister({ store }: PiniaPluginContext): void {
+function autoStoreRegister({ store }: Readonly<PiniaPluginContext>): void {
   if (store.$id === "app") {
     return;
   }
 
   const appStore = useAppStore();
   appStore.registerStore(store);
-  console.log(`[AutoRegister] Store "${store.$id}" processed`);
 }
 
 export default defineNuxtPlugin({
@@ -18,12 +15,10 @@ export default defineNuxtPlugin({
   dependsOn: ["pinia"],
   setup(nuxtApp) {
     const { $pinia } = nuxtApp;
-    if (!$pinia) {
-      console.warn("Pinia instance not available.");
+    if ($pinia === undefined) {
       return;
     }
 
     $pinia.use(autoStoreRegister);
-    console.log("[AUTOREGISTER PLUGIN] Loaded automatically from OpenGeodeWeb-Front");
   },
 });
diff --git a/app/stores/app.ts b/app/stores/app.ts
index c099bea3..910d06b8 100644
--- a/app/stores/app.ts
+++ b/app/stores/app.ts
@@ -1,11 +1,9 @@
-// This file grew past the 310-line limit purely from added type annotations/interfaces during the TypeScript migration, with no new logic.
-// oxlint-disable eslint/max-lines
 // Local imports
 import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores.js";
 import { Status } from "@ogw_front/utils/status";
 import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
-import { killExtension } from "@ogw_front/utils/extension.js";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
+import { useAppExtensions } from "./app_helpers/extension.js";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
 import type { JsonRpcSchema, RequestHandlers } from "@ogw_shared/utils/types.js";
@@ -24,34 +22,14 @@ declare module "pinia" {
 
 interface RegisterableStore {
   $id: string;
-  $patch?: (partial: Record<string, unknown>) => void;
-  exportStores?: (params?: Record<string, unknown>) => Promise<unknown>;
+  $patch?: (partial: Readonly<Record<string, unknown>>) => void;
+  exportStores?: (params?: Readonly<Record<string, unknown>>) => Promise<unknown>;
   importStores?: (snapshot: unknown) => Promise<void> | void;
+  connect?: () => Promise<void>;
+  kill?: () => Promise<void>;
   [key: string]: unknown;
 }
 
-interface ExtensionMetadata {
-  id: string;
-  store: () => RegisterableStore;
-  [key: string]: unknown;
-}
-
-interface ExtensionModule {
-  metadata: ExtensionMetadata;
-  install: (api: unknown, backendPath?: string) => Promise<void>;
-  [key: string]: unknown;
-}
-
-interface ExtensionData {
-  module: ExtensionModule;
-  id: string;
-  path: string;
-  backendPath: string | undefined;
-  loadedAt: string;
-  metadata: ExtensionMetadata;
-  enabled: boolean;
-}
-
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores: RegisterableStore[] = [];
@@ -79,9 +57,6 @@ export const useAppStore = defineStore("app", () => {
       globalComponents.value.set(extensionId, new Map());
     }
     globalComponents.value.get(extensionId)?.set(componentId, component);
-    console.log(
-      `[AppStore] Registered global component ${componentId} for extension ${extensionId}`,
-    );
   }
 
   function unregisterGlobalComponent(extensionId: string, componentId: string): void {
@@ -90,226 +65,116 @@ export const useAppStore = defineStore("app", () => {
     }
   }
 
-  function registerStore(store: RegisterableStore): void {
-    const isAlreadyRegistered = stores.some((registeredStore) => registeredStore.$id === store.$id);
+  function registerStore(store: Readonly<RegisterableStore>): void {
+    const isAlreadyRegistered = stores.some(
+      (registeredStore: Readonly<RegisterableStore>) => registeredStore.$id === store.$id,
+    );
     if (isAlreadyRegistered) {
-      console.log(`[AppStore] Store "${store.$id}" already registered, skipping`);
       return;
     }
-    console.log("[AppStore] Registering store", store.$id);
     stores.push(store);
   }
 
   async function exportStores(
-    params: Record<string, unknown> = {},
+    params: Readonly<Record<string, unknown>> = {},
   ): Promise<Record<string, unknown>> {
     const snapshot: Record<string, unknown> = {};
-    let exportCount = 0;
 
-    console.log(`[AppStore] Exporting stores, total registered: ${stores.length}`);
     await Promise.all(
-      stores.map(async (store) => {
+      stores.map(async (store: Readonly<RegisterableStore>) => {
         if (!store.exportStores) {
           return;
         }
         const storeId = store.$id;
         try {
           snapshot[storeId] = await store.exportStores(params);
-          exportCount += 1;
-        } catch (error) {
-          console.error(`[AppStore] Error exporting store "${storeId}":`, error);
+        } catch {
+          // Ignore stores that fail to export; other stores still complete independently.
         }
       }),
     );
-    console.log(`[AppStore] Exported ${exportCount} stores; snapshot keys:`, Object.keys(snapshot));
     return snapshot;
   }
 
-  async function importStores(snapshot: Record<string, unknown> | undefined): Promise<void> {
+  async function importStores(
+    snapshot: Readonly<Record<string, unknown>> | undefined,
+  ): Promise<void> {
     if (!snapshot) {
-      console.warn("[AppStore] import called with invalid snapshot");
       return;
     }
-    console.log("[AppStore] Import snapshot keys:", Object.keys(snapshot || {}));
 
-    let importedCount = 0;
-    const notFoundStores: string[] = [];
+    const missingStoreIds: string[] = [];
+
     await Promise.all(
-      stores.map(async (store) => {
+      stores.map(async (store: Readonly<RegisterableStore>) => {
         if (!store.importStores) {
           return;
         }
         const storeId = store.$id;
-        if (!snapshot[storeId]) {
-          notFoundStores.push(storeId);
+        if (snapshot[storeId] === undefined) {
+          missingStoreIds.push(storeId);
           return;
         }
         try {
           await store.importStores(snapshot[storeId]);
-          importedCount += 1;
-        } catch (error) {
-          console.error(`[AppStore] Error importing store "${storeId}":`, error);
+        } catch {
+          // Ignore stores that fail to import; other stores still complete independently.
         }
       }),
     );
-    if (notFoundStores.length > 0) {
-      console.warn(`[AppStore] Stores not found in snapshot: ${notFoundStores.join(", ")}`);
-    }
-    console.log(`[AppStore] Imported ${importedCount} stores`);
-  }
-
-  const loadedExtensions = ref<Map<string, ExtensionData>>(new Map());
-  const extensionAPI = ref<unknown>(undefined);
-  const codeTransformer = ref<((code: string) => string) | undefined>(undefined);
-
-  function setExtensionAPI(api: unknown): void {
-    extensionAPI.value = api;
-  }
-
-  function setCodeTransformer(transformer: (code: string) => string): void {
-    codeTransformer.value = transformer;
-  }
-
-  function getExtension(id: string): ExtensionData | undefined {
-    return loadedExtensions.value.get(id);
-  }
-
-  async function loadExtension(
-    path: string,
-    extensionPort: string,
-    backendPath: string | undefined = undefined,
-  ): Promise<ExtensionModule> {
-    try {
-      let finalURL = path;
-
-      if (codeTransformer.value && path.startsWith("blob:")) {
-        const response = await fetch(path);
-        const code = await response.text();
-        const transformedCode = codeTransformer.value(code);
-
-        const newBlob = new Blob([transformedCode], {
-          type: "application/javascript",
-        });
-        finalURL = URL.createObjectURL(newBlob);
-      }
-      // oxlint-disable-next-line no-inline-comments
-      const extensionModule: ExtensionModule = await import(/* @vite-ignore */ finalURL);
-      const store = extensionModule.metadata.store();
-      store.$patch?.({ default_local_port: extensionPort });
-
-      if (finalURL !== path && finalURL.startsWith("blob:")) {
-        URL.revokeObjectURL(finalURL);
-      }
-
-      if (!extensionModule.metadata?.id) {
-        throw new Error("Extension must have metadata.id");
-      }
-
-      const extensionId = extensionModule.metadata.id;
-
-      if (loadedExtensions.value.has(extensionId)) {
-        console.warn(`[AppStore] Extension "${extensionId}" is already loaded`);
-        throw new Error(`Extension "${extensionId}" is already loaded.`);
-      }
-
-      if (!extensionAPI.value) {
-        throw new Error("Extension API not initialized");
-      }
-
-      if (typeof extensionModule.install !== "function") {
-        throw new TypeError("Extension must export an install function");
-      }
 
-      await extensionModule.install(extensionAPI.value, backendPath);
-
-      const extensionData: ExtensionData = {
-        module: extensionModule,
-        id: extensionId,
-        path,
-        backendPath,
-        loadedAt: new Date().toISOString(),
-        metadata: extensionModule.metadata,
-        enabled: true,
-      };
-      loadedExtensions.value.set(extensionId, extensionData);
-
-      console.log(`[AppStore] Extension loaded successfully: ${extensionId}`);
-      return extensionModule;
-    } catch (error) {
-      console.error(`[AppStore] Failed to load extension from ${path}:`, error);
-      throw error;
-    }
-  }
-
-  function getLoadedExtensions(): ExtensionData[] {
-    return [...loadedExtensions.value.values()];
-  }
-
-  async function unloadExtension(extensionId: string): Promise<boolean> {
-    console.log(`[AppStore] Unloading extension: ${extensionId}`);
-    const infraStore = useInfraStore();
-    await infraStore.unregister_microservice(extensionId);
-    await killExtension(extensionId);
-
-    loadedExtensions.value.delete(extensionId);
-    console.log(`[AppStore] Extension unloaded: ${extensionId}`);
-    return true;
-  }
-
-  function toggleExtension(extensionId: string): boolean {
-    const extensionData = getExtension(extensionId);
-    if (!extensionData) {
-      return false;
-    }
-    extensionData.enabled = !extensionData.enabled;
-    console.log(
-      `[AppStore] Extension ${extensionData.enabled ? "enabled" : "disabled"}: ${extensionId}`,
-    );
-    return extensionData.enabled;
-  }
-
-  function setExtensionEnabled(extensionId: string, enabled: boolean): boolean {
-    const extensionData = getExtension(extensionId);
-    if (!extensionData) {
-      return false;
+    if (missingStoreIds.length > 0) {
+      console.warn(`Stores not found in snapshot: ${missingStoreIds.join(", ")}`);
     }
-    extensionData.enabled = enabled;
-    console.log(`[AppStore] Extension ${enabled ? "enabled" : "disabled"}: ${extensionId}`);
-    return true;
   }
 
-  function getExtensionEnabled(extensionId: string): boolean {
-    return getExtension(extensionId)?.enabled ?? false;
-  }
+  const {
+    loadedExtensions,
+    extensionAPI,
+    setExtensionAPI,
+    setCodeTransformer,
+    getExtension,
+    loadExtension,
+    getLoadedExtensions,
+    unloadExtension,
+    toggleExtension,
+    setExtensionEnabled,
+    getExtensionEnabled,
+  } = useAppExtensions();
 
-  function upload(file: File, callbacks: RequestHandlers = {}) {
+  async function upload(file: Readonly<File>, callbacks: RequestHandlers = {}): Promise<unknown> {
     const store = useAppStore();
     const schema = opengeodeweb_front_schemas.api.local.extensions.upload;
     const { PROJECT: projectName } = useRuntimeConfig().public;
     const params = { projectName };
-    return upload_file(
+    const result = await upload_file(
       store,
       { schema, file, params },
       {
         ...callbacks,
         response_function: async (response: unknown) => {
-          console.log("[APP] Request completed:", schema.$id);
           if (callbacks.response_function) {
             await callbacks.response_function(response);
           }
         },
       },
     );
+    return result;
   }
 
-  function request(
-    { schema, params }: { schema: JsonRpcSchema; params?: Record<string, unknown> },
+  // `TResult` is asserted, not verified, at the single `return result as TResult` boundary below: the backend response is only checked against `schema` at runtime, so callers' `TResult` is a contract with the schema, not something this function can prove.
+  async function request<TResult = unknown>(
+    {
+      schema,
+      params,
+    }: Readonly<{ schema: JsonRpcSchema; params?: Readonly<Record<string, unknown>> }>,
     callbacks: RequestHandlers = {},
-  ) {
+  ): Promise<TResult> {
     const store = useAppStore();
-    return api_fetch(
+    const result = await api_fetch(
       store,
       // The app store is only ever used with HTTP ("front") schemas, which always carry `methods`; the wider JsonRpcSchema param above is kept as-is to match this action's public signature (e.g. relayed from get_version-style callers that only know about the shared, looser schema shape).
+      // oxlint-disable-next-line no-unsafe-type-assertion -- narrowing optional `methods` to required is safe here; see comment above.
       { schema: schema as JsonRpcSchema & { methods: string[] }, params },
       {
         ...callbacks,
@@ -320,6 +185,8 @@ export const useAppStore = defineStore("app", () => {
         },
       },
     );
+    // oxlint-disable-next-line no-unsafe-type-assertion -- this is the trusted API boundary; see comment above.
+    return result as TResult;
   }
 
   const request_counter = ref(0);
@@ -333,22 +200,23 @@ export const useAppStore = defineStore("app", () => {
 
   const projectFolderPath = ref("");
 
-  function createProjectFolder() {
+  async function createProjectFolder(): Promise<unknown> {
     const { PROJECT } = useRuntimeConfig().public;
     const schema = opengeodeweb_front_schemas.api.local.app.project_folder_path;
     const params = { PROJECT };
-    return request(
+    const result = await request(
       { schema, params },
       {
         response_function: (response: unknown) => {
+          // oxlint-disable-next-line no-unsafe-type-assertion
           const { projectFolderPath: newProjectFolderPath } = response as {
             projectFolderPath: string;
           };
-          console.log(`[APP] ${newProjectFolderPath} created`);
           projectFolderPath.value = newProjectFolderPath;
         },
       },
     );
+    return result;
   }
 
   return {
@@ -385,3 +253,5 @@ export const useAppStore = defineStore("app", () => {
     unregisterGlobalComponent,
   };
 });
+
+export type { RegisterableStore };
diff --git a/app/stores/app_helpers/extension.ts b/app/stores/app_helpers/extension.ts
new file mode 100644
index 00000000..0426fd20
--- /dev/null
+++ b/app/stores/app_helpers/extension.ts
@@ -0,0 +1,179 @@
+import { killExtension } from "@ogw_front/utils/extension.js";
+import { useInfraStore } from "@ogw_front/stores/infra";
+
+import type { RegisterableStore } from "@ogw_front/stores/app";
+
+interface ExtensionMetadata {
+  id: string;
+  store: () => RegisterableStore;
+  [key: string]: unknown;
+}
+
+interface ExtensionModule {
+  metadata: ExtensionMetadata;
+  install: (api: unknown, backendPath?: string) => Promise<void>;
+  [key: string]: unknown;
+}
+
+interface ExtensionData {
+  module: ExtensionModule;
+  id: string;
+  path: string;
+  backendPath: string | undefined;
+  loadedAt: string;
+  metadata: ExtensionMetadata;
+  enabled: boolean;
+}
+
+// oxlint-disable-next-line max-lines-per-function, max-statements
+export function useAppExtensions(): {
+  loadedExtensions: typeof loadedExtensions;
+  extensionAPI: typeof extensionAPI;
+  setExtensionAPI: typeof setExtensionAPI;
+  setCodeTransformer: typeof setCodeTransformer;
+  getExtension: typeof getExtension;
+  loadExtension: typeof loadExtension;
+  getLoadedExtensions: typeof getLoadedExtensions;
+  unloadExtension: typeof unloadExtension;
+  toggleExtension: typeof toggleExtension;
+  setExtensionEnabled: typeof setExtensionEnabled;
+  getExtensionEnabled: typeof getExtensionEnabled;
+} {
+  const loadedExtensions = ref<Map<string, ExtensionData>>(new Map());
+  const extensionAPI = ref<unknown>(undefined);
+  const codeTransformer = ref<((code: string) => string) | undefined>(undefined);
+
+  function setExtensionAPI(api: unknown): void {
+    extensionAPI.value = api;
+  }
+
+  function setCodeTransformer(transformer: (code: string) => string): void {
+    codeTransformer.value = transformer;
+  }
+
+  function getExtension(id: string): ExtensionData | undefined {
+    return loadedExtensions.value.get(id);
+  }
+
+  async function loadExtension(
+    path: string,
+    extensionPort: string,
+    backendPath?: string,
+  ): Promise<ExtensionModule> {
+    try {
+      let finalURL = path;
+
+      if (codeTransformer.value && path.startsWith("blob:")) {
+        const response = await fetch(path);
+        const code = await response.text();
+        const transformedCode = codeTransformer.value(code);
+
+        const newBlob = new Blob([transformedCode], {
+          type: "application/javascript",
+        });
+        finalURL = URL.createObjectURL(newBlob);
+      }
+      // oxlint-disable-next-line no-inline-comments, no-unsafe-assignment
+      const extensionModule: ExtensionModule = await import(/* @vite-ignore */ finalURL);
+      const store = extensionModule.metadata.store();
+      store.$patch?.({ default_local_port: extensionPort });
+
+      if (finalURL !== path && finalURL.startsWith("blob:")) {
+        URL.revokeObjectURL(finalURL);
+      }
+
+      if (!extensionModule.metadata?.id) {
+        throw new Error("Extension must have metadata.id");
+      }
+
+      const extensionId = extensionModule.metadata.id;
+
+      if (loadedExtensions.value.has(extensionId)) {
+        console.warn(`[AppStore] Extension "${extensionId}" is already loaded`);
+        throw new Error(`Extension "${extensionId}" is already loaded.`);
+      }
+
+      if (extensionAPI.value === undefined) {
+        throw new Error("Extension API not initialized");
+      }
+
+      if (typeof extensionModule.install !== "function") {
+        throw new TypeError("Extension must export an install function");
+      }
+
+      await extensionModule.install(extensionAPI.value, backendPath);
+
+      const extensionData: ExtensionData = {
+        module: extensionModule,
+        id: extensionId,
+        path,
+        backendPath,
+        loadedAt: new Date().toISOString(),
+        metadata: extensionModule.metadata,
+        enabled: true,
+      };
+      loadedExtensions.value.set(extensionId, extensionData);
+
+      console.log(`[AppStore] Extension loaded successfully: ${extensionId}`);
+      return extensionModule;
+    } catch (error) {
+      console.error(`[AppStore] Failed to load extension from ${path}:`, error);
+      throw error;
+    }
+  }
+
+  function getLoadedExtensions(): ExtensionData[] {
+    return [...loadedExtensions.value.values()];
+  }
+
+  async function unloadExtension(extensionId: string): Promise<boolean> {
+    console.log(`[AppStore] Unloading extension: ${extensionId}`);
+    const infraStore = useInfraStore();
+    infraStore.unregister_microservice(extensionId);
+    await killExtension(extensionId);
+
+    loadedExtensions.value.delete(extensionId);
+    console.log(`[AppStore] Extension unloaded: ${extensionId}`);
+    return true;
+  }
+
+  function toggleExtension(extensionId: string): boolean {
+    const extensionData = getExtension(extensionId);
+    if (!extensionData) {
+      return false;
+    }
+    extensionData.enabled = !extensionData.enabled;
+    console.log(
+      `[AppStore] Extension ${extensionData.enabled ? "enabled" : "disabled"}: ${extensionId}`,
+    );
+    return extensionData.enabled;
+  }
+
+  function setExtensionEnabled(extensionId: string, enabled: boolean): boolean {
+    const extensionData = getExtension(extensionId);
+    if (!extensionData) {
+      return false;
+    }
+    extensionData.enabled = enabled;
+    console.log(`[AppStore] Extension ${enabled ? "enabled" : "disabled"}: ${extensionId}`);
+    return true;
+  }
+
+  function getExtensionEnabled(extensionId: string): boolean {
+    return getExtension(extensionId)?.enabled ?? false;
+  }
+
+  return {
+    loadedExtensions,
+    extensionAPI,
+    setExtensionAPI,
+    setCodeTransformer,
+    getExtension,
+    loadExtension,
+    getLoadedExtensions,
+    unloadExtension,
+    toggleExtension,
+    setExtensionEnabled,
+    getExtensionEnabled,
+  };
+}
diff --git a/app/stores/back.ts b/app/stores/back.ts
index d41578ab..57562f7d 100644
--- a/app/stores/back.ts
+++ b/app/stores/back.ts
@@ -42,15 +42,17 @@ export const useBackStore = defineStore("back", {
   },
   actions: {
     set_ping() {
+      // oxlint-disable-next-line typescript/no-floating-promises
       this.ping();
       setInterval(() => {
+        // oxlint-disable-next-line typescript/no-floating-promises
         this.ping();
       }, DEFAULT_PING_INTERVAL_SECONDS * MILLISECONDS_IN_SECOND);
     },
-    ping() {
+    async ping() {
       const feedbackStore = useFeedbackStore();
       const schema = back_schemas.opengeodeweb_back.ping;
-      return this.request(
+      const result = await this.request(
         { schema },
         {
           request_error_function: () => {
@@ -67,6 +69,7 @@ export const useBackStore = defineStore("back", {
           },
         },
       );
+      return result;
     },
     start_request() {
       this.request_counter += 1;
@@ -74,39 +77,46 @@ export const useBackStore = defineStore("back", {
     stop_request() {
       this.request_counter -= 1;
     },
-    launch(args: Record<string, unknown>) {
-      console.log("[GEODE] Launching back microservice...", { args });
+    async launch(args: Readonly<Record<string, unknown>>) {
       const appStore = useAppStore();
       const { COMMAND_BACK, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = opengeodeweb_front_schemas.api.local.app.run_back;
       const params = { COMMAND_BACK, NUXT_ROOT_PATH, args };
 
-      console.log("[GEODE] params", params);
-      return appStore.request(
+      const result = await appStore.request(
         { schema, params },
         {
           response_function: (response: unknown) => {
-            const { port } = response as { port: string };
-            console.log(`[GEODE] Back launched on port ${port}`);
-            this.default_local_port = port;
+            if (
+              typeof response === "object" &&
+              response !== null &&
+              "port" in response &&
+              (typeof response.port === "string" || typeof response.port === "number")
+            ) {
+              this.default_local_port = String(response.port);
+            }
           },
         },
       );
+      return result;
     },
-    connect() {
-      console.log("[GEODE] Connecting to geode microservice...");
+    async connect(): Promise<void> {
       this.set_ping();
-      return Promise.resolve();
+      await Promise.resolve();
     },
-    request(
-      { schema, params = {} }: { schema: JsonRpcSchema; params?: Record<string, unknown> },
+    async request(
+      {
+        schema,
+        params = {},
+      }: Readonly<{ schema: JsonRpcSchema; params?: Record<string, unknown> }>,
       callbacks: RequestHandlers = {},
     ) {
-      return api_fetch(
+      const result = await api_fetch(
         this,
         // The back store is only ever used with HTTP ("front"/"back") schemas,
         // Which always carry `methods`; the wider JsonRpcSchema param above is
         // Kept as-is to match this action's public signature.
+        // oxlint-disable-next-line typescript/no-unsafe-type-assertion
         { schema: schema as JsonRpcSchema & { methods: string[] }, params, headers: {} },
         {
           ...callbacks,
@@ -117,10 +127,11 @@ export const useBackStore = defineStore("back", {
           },
         },
       );
+      return result;
     },
-    upload(file: File, callbacks: RequestHandlers = {}) {
+    async upload(file: Readonly<File>, callbacks: RequestHandlers = {}) {
       const schema = back_schemas.opengeodeweb_back.upload_file;
-      return upload_file(
+      const result = await upload_file(
         this,
         {
           schema,
@@ -135,20 +146,28 @@ export const useBackStore = defineStore("back", {
           },
         },
       );
+      return result;
     },
-    get_version(schema: JsonRpcSchema | undefined) {
+    async get_version(schema: JsonRpcSchema | undefined) {
       if (!schema) {
-        return;
+        return undefined;
       }
-      return this.request(
+      const result = await this.request(
         { schema },
         {
           response_function: (response: unknown) => {
-            const { microservice_version } = response as { microservice_version: string };
-            this.version = microservice_version;
+            if (
+              typeof response === "object" &&
+              response !== null &&
+              "microservice_version" in response &&
+              typeof response.microservice_version === "string"
+            ) {
+              this.version = response.microservice_version;
+            }
           },
         },
       );
+      return result;
     },
   },
   share: {
diff --git a/app/stores/camera_manager.ts b/app/stores/camera_manager.ts
index f009598b..d6da4030 100644
--- a/app/stores/camera_manager.ts
+++ b/app/stores/camera_manager.ts
@@ -1,17 +1,12 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// Third party imports
-import { liveQuery } from "dexie";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Table } from "dexie";
-import { useObservable } from "@vueuse/rxjs";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import { type Table, liveQuery } from "dexie";
 import type { Observable } from "rxjs";
+import { useObservable } from "@vueuse/rxjs";
 
 // Local imports
+import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
 import { database } from "@ogw_internal/database/database.js";
 import { useViewerStore } from "@ogw_front/stores/viewer";
-import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types.js";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 interface CameraPositionRecord {
   id?: number;
@@ -19,38 +14,48 @@ interface CameraPositionRecord {
   camera_options: CameraOptions;
 }
 
+// oxlint-disable-next-line max-lines-per-function
 export const useCameraManagerStore = defineStore("camera_manager", () => {
   const viewerStore = useViewerStore();
+  // Database's table map is assembled dynamically at runtime (see internal/database/database.ts),
+  // So it's typed as `{}`; this store's table is registered before use, hence the cast.
+  // oxlint-disable-next-line no-unsafe-type-assertion -- trusted database table boundary.
   const camera_positions_db = database.camera_positions as unknown as Table<
     CameraPositionRecord,
     number
   >;
 
-  function refAllCameraPositions() {
+  function refAllCameraPositions(): Readonly<Ref<CameraPositionRecord[]>> {
     // Dexie's liveQuery() returns Dexie's own minimal Observable shape, not an
     // Actual rxjs Observable instance (useObservable's declared parameter type);
     // The two are structurally close enough at runtime (vueuse only calls
     // `.subscribe`) but not identical, hence the cast.
     return useObservable(
-      liveQuery(() => camera_positions_db.toArray()) as unknown as Observable<
-        CameraPositionRecord[]
-      >,
+      liveQuery(async () => {
+        const positions = await camera_positions_db.toArray();
+        return positions;
+        // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vueuse/Dexie Observable boundary; see comment above.
+      }) as unknown as Observable<CameraPositionRecord[]>,
       { initialValue: [] as CameraPositionRecord[] },
     );
   }
 
-  async function getCameraPosition(id: number) {
-    return await camera_positions_db.get(id);
+  async function getCameraPosition(id: number): Promise<CameraPositionRecord | undefined> {
+    const position = await camera_positions_db.get(id);
+    return position;
   }
 
-  async function saveCameraPosition(name: string, camera_options: CameraOptions) {
+  async function saveCameraPosition(
+    name: string,
+    camera_options: Readonly<CameraOptions>,
+  ): Promise<void> {
     await camera_positions_db.put({
       name,
       camera_options,
-    } as CameraPositionRecord);
+    });
   }
 
-  async function restoreCameraPosition(id: number) {
+  async function restoreCameraPosition(id: number): Promise<void> {
     const position = await camera_positions_db.get(id);
     if (position) {
       const schema = viewer_schemas.opengeodeweb_viewer.viewer.update_camera;
@@ -59,11 +64,11 @@ export const useCameraManagerStore = defineStore("camera_manager", () => {
     }
   }
 
-  async function deleteCameraPosition(id: number) {
+  async function deleteCameraPosition(id: number): Promise<void> {
     await camera_positions_db.delete(id);
   }
 
-  async function renameCameraPosition(id: number, newName: string) {
+  async function renameCameraPosition(id: number, newName: string): Promise<void> {
     await camera_positions_db.update(id, { name: newName });
   }
 
diff --git a/app/stores/cloud.ts b/app/stores/cloud.ts
index 81794087..5dd6b5cb 100644
--- a/app/stores/cloud.ts
+++ b/app/stores/cloud.ts
@@ -1,9 +1,6 @@
 import { Status } from "@ogw_front/utils/status";
 import { fetchSchema } from "@ogw_shared/utils/fetch_schema";
 import { setAppBaseUrl } from "@ogw_shared/scripts";
-import { useAppStore } from "./app";
-import { useFeedbackStore } from "./feedback";
-import { useInfraStore } from "./infra";
 
 import opengeodeweb_front_schemas from "@geode/opengeodeweb-front/opengeodeweb_front_schemas.json" with { type: "json" };
 
@@ -12,31 +9,39 @@ export const useCloudStore = defineStore("cloud", {
     status: Status.NOT_CONNECTED,
   }),
   actions: {
-    launch(email: string) {
+    async launch(email: string) {
       this.status = Status.CONNECTING;
-      console.log("[CLOUD] Launching cloud backend...");
       const schema = opengeodeweb_front_schemas.api.serverless.run_cloud;
       const params = { email };
-      console.log("[CLOUD] params", params);
+      const { useAppStore } = await import("./app");
+      const { useFeedbackStore } = await import("./feedback");
       const appStore = useAppStore();
       const feedbackStore = useFeedbackStore();
-      return fetchSchema(
+      const result = await fetchSchema(
         { schema, params },
         {
           request_error_function: () => {
             feedbackStore.$patch({ server_error: true });
             this.status = Status.NOT_CONNECTED;
           },
-          response_function: (response: unknown) => {
-            const { url } = response as { url: string };
+          response_function: async (response: unknown) => {
+            if (
+              typeof response !== "object" ||
+              response === null ||
+              !("url" in response) ||
+              typeof response.url !== "string"
+            ) {
+              return;
+            }
+            const { url } = response;
             feedbackStore.$patch({ server_error: false });
-            console.log(`[CLOUD] Cloud launched on ${url}`);
             this.status = Status.CONNECTED;
+            const { useInfraStore } = await import("./infra");
             const infraStore = useInfraStore();
             infraStore.$patch({
               domain_name: url,
             });
-            setAppBaseUrl(appStore.base_url);
+            setAppBaseUrl(appStore.base_url).catch(() => undefined);
             appStore.$patch({
               projectFolderPath: "/project",
             });
@@ -47,11 +52,10 @@ export const useCloudStore = defineStore("cloud", {
           },
         },
       );
+      return result;
     },
     connect() {
-      console.log("[CLOUD] Cloud connected");
       this.status = Status.CONNECTED;
-      return Promise.resolve();
     },
   },
   share: {
diff --git a/app/stores/data.ts b/app/stores/data.ts
index 6d650aad..d7821339 100644
--- a/app/stores/data.ts
+++ b/app/stores/data.ts
@@ -1,19 +1,14 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports, eslint/max-lines
+// oxlint-disable eslint/max-lines
 // Third party imports
-import { liveQuery } from "dexie";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Table } from "dexie";
+import { type Table, liveQuery } from "dexie";
+import type { Observable } from "rxjs";
 import { useObservable } from "@vueuse/rxjs";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { Observable } from "rxjs";
 
 // Local imports
+import { type ModelComponentRecord, useDataMesh } from "./data_helpers/mesh.js";
 import { database } from "@ogw_internal/database/database.js";
 import { useDataCollections } from "./data_helpers/collections.js";
-import { useDataMesh } from "./data_helpers/mesh.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { ModelComponentRecord } from "./data_helpers/mesh.js";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 interface DataItem {
@@ -66,12 +61,16 @@ interface ViewableItemLike {
 }
 
 const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic;
-function checkItemViewable(item: ViewableItemLike | undefined | null): boolean {
+// The database's table map is dynamically assembled at runtime (see internal/database/database.ts), so its exported type is a loose `{}`; cast it to the shape it actually has at runtime rather than widening every call site.
+type DatabaseTables = Record<string, unknown>;
+// oxlint-disable-next-line no-unsafe-type-assertion -- see comment above.
+const typedDatabase = database as unknown as DatabaseTables;
+function checkItemViewable(item: Readonly<ViewableItemLike> | undefined | null): boolean {
   if (!item || typeof item !== "object") {
     return false;
   }
   if (item.is_viewable !== undefined) {
-    return Boolean(item.is_viewable);
+    return item.is_viewable;
   }
   if (item.binary_light_viewable !== undefined) {
     return item.binary_light_viewable !== "not_viewable";
@@ -85,11 +84,10 @@ function checkItemViewable(item: ViewableItemLike | undefined | null): boolean {
   }
   return true;
 }
-function isItemViewable(itemOrId: string | ViewableItemLike): boolean | Promise<boolean> {
+function isItemViewable(itemOrId: string | Readonly<ViewableItemLike>): boolean | Promise<boolean> {
   if (typeof itemOrId === "string") {
-    return (database.data as unknown as Table<DataItem, string>)
-      .get(itemOrId)
-      .then(checkItemViewable);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+    return (typedDatabase.data as Table<DataItem, string>).get(itemOrId).then(checkItemViewable);
   }
   return checkItemViewable(itemOrId);
 }
@@ -97,12 +95,12 @@ function isItemViewable(itemOrId: string | ViewableItemLike): boolean | Promise<
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useDataStore = defineStore("data", () => {
   const viewerStore = useViewerStore();
-  const data_db = database.data as unknown as Table<DataItem, string>;
-  const model_components_db = database.model_components as unknown as Table<
-    ModelComponentRecord,
-    string
-  >;
-  const model_components_relation_db = database.model_components_relation as unknown as Table<
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+  const data_db = typedDatabase.data as Table<DataItem, string>;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+  const model_components_db = typedDatabase.model_components as Table<ModelComponentRecord, string>;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+  const model_components_relation_db = typedDatabase.model_components_relation as Table<
     ModelComponentRelationRecord,
     string
   >;
@@ -133,24 +131,37 @@ export const useDataStore = defineStore("data", () => {
     return data_item;
   }
   async function allItems(): Promise<DataItem[]> {
-    return await data_db.toArray();
+    const items = await data_db.toArray();
+    return items;
   }
-  function refItem(id: string) {
+  function refItem(id: string): Readonly<Ref<DataItem | undefined>> {
     // Dexie's liveQuery() returns Dexie's own minimal Observable shape, not an
     // Actual rxjs Observable instance (useObservable's declared parameter type);
     // The two are structurally close enough at runtime (vueuse only calls
     // `.subscribe`) but not identical, hence the cast.
     return useObservable(
-      liveQuery(() => data_db.get(id)) as unknown as Observable<DataItem | undefined>,
+      liveQuery(async () => {
+        const data_item = await data_db.get(id);
+        return data_item;
+        // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vueuse/Dexie Observable boundary; see comment above.
+      }) as unknown as Observable<DataItem | undefined>,
       {
+        // oxlint-disable-next-line no-unsafe-type-assertion -- placeholder until the live query resolves; consumers must treat this as possibly incomplete.
         initialValue: {} as DataItem,
       },
     );
   }
-  function refAllItems() {
-    return useObservable(liveQuery(() => data_db.toArray()) as unknown as Observable<DataItem[]>, {
-      initialValue: [] as DataItem[],
-    });
+  function refAllItems(): Readonly<Ref<DataItem[]>> {
+    return useObservable(
+      liveQuery(async () => {
+        const items = await data_db.toArray();
+        return items;
+        // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vueuse/Dexie Observable boundary; see comment above.
+      }) as unknown as Observable<DataItem[]>,
+      {
+        initialValue: [] as DataItem[],
+      },
+    );
   }
   async function meshComponentType(modelId: string, geode_id: string): Promise<string | undefined> {
     const component = await model_components_db
@@ -159,32 +170,36 @@ export const useDataStore = defineStore("data", () => {
       .first();
     return component?.type;
   }
-  async function registerObject(id: string, name: string) {
+  async function registerObject(id: string, name: string): Promise<unknown> {
     const schema = viewer_generic_schemas.register;
     const params = {
       id,
       name,
     };
-    return await viewerStore.request({
+    const result = await viewerStore.request({
       schema,
       params,
       timeout: 0,
     });
+    return result;
   }
-  async function deregisterObject(id: string) {
+  async function deregisterObject(id: string): Promise<unknown> {
     const schema = viewer_generic_schemas.deregister;
     const params = {
       id,
     };
-    return await viewerStore.request({
+    const result = await viewerStore.request({
       schema,
       params,
     });
+    return result;
   }
-  function addItem(new_item: NewDataItem) {
+  // NewDataItem has mutable array fields (mesh_components, collection_components), so Readonly<>
+  // Can't satisfy prefer-readonly-parameter-types deeply; same pattern as app/utils/import_workflow.ts.
+  async function addItem(new_item: Readonly<NewDataItem>): Promise<string> {
     const itemData: DataItem = {
       id: new_item.id,
-      name: new_item.name || new_item.id,
+      name: new_item.name ?? new_item.id,
       viewer_type: new_item.viewer_type,
       geode_object_type: new_item.geode_object_type,
       visible: true,
@@ -194,11 +209,16 @@ export const useDataStore = defineStore("data", () => {
     if (new_item.binary_light_viewable !== undefined && new_item.binary_light_viewable !== null) {
       itemData.binary_light_viewable = new_item.binary_light_viewable;
     }
-    return data_db.put(itemData);
+    const id = await data_db.put(itemData);
+    return id;
   }
-  function addComponents(new_item: NewDataItem) {
+  // NewDataItem has mutable array fields (mesh_components, collection_components), so Readonly<>
+  // Can't satisfy prefer-readonly-parameter-types deeply; same pattern as app/utils/import_workflow.ts.
+  async function addComponents(new_item: Readonly<NewDataItem>): Promise<string> {
     const allComponents: ModelComponentRecord[] = [];
-    function addModelComponents(components: ModelComponentInput[]) {
+    // ModelComponentInput has mutable array fields (boundaries, internals, items), so a readonly
+    // Array of it can't satisfy prefer-readonly-parameter-types deeply; same limitation as above.
+    function addModelComponents(components: readonly ModelComponentInput[]): void {
       for (const component of components) {
         allComponents.push({
           id: new_item.id,
@@ -216,11 +236,18 @@ export const useDataStore = defineStore("data", () => {
     if (new_item.collection_components) {
       addModelComponents(new_item.collection_components);
     }
-    return model_components_db.bulkPut(allComponents);
+    const lastKey = await model_components_db.bulkPut(allComponents);
+    return lastKey;
   }
-  function addComponentRelations(new_item: NewDataItem) {
+  // NewDataItem has mutable array fields (mesh_components, collection_components), so Readonly<>
+  // Can't satisfy prefer-readonly-parameter-types deeply; same pattern as app/utils/import_workflow.ts.
+  async function addComponentRelations(new_item: Readonly<NewDataItem>): Promise<string> {
     const relations: ModelComponentRelationRecord[] = [];
-    function addModelComponentRelations(components: string[], parent: string, type: string) {
+    function addModelComponentRelations(
+      components: readonly string[],
+      parent: string,
+      type: string,
+    ): void {
       for (const child of components) {
         relations.push({
           id: new_item.id,
@@ -247,13 +274,17 @@ export const useDataStore = defineStore("data", () => {
         }
       }
     }
-    return model_components_relation_db.bulkPut(relations);
+    const lastKey = await model_components_relation_db.bulkPut(relations);
+    return lastKey;
   }
-  async function getComponentByViewerId(modelId: string, viewer_id: string | number) {
+  async function getComponentByViewerId(
+    modelId: string,
+    viewer_id: string | number,
+  ): Promise<ModelComponentRecord | undefined> {
     const component = await model_components_db
       .where("viewer_id")
       .equals(Number(viewer_id))
-      .and((model_component) => model_component.id === modelId)
+      .and((model_component: Readonly<ModelComponentRecord>) => model_component.id === modelId)
       .first();
     return component;
   }
@@ -273,19 +304,27 @@ export const useDataStore = defineStore("data", () => {
 
   async function getAllModelComponentsViewerIds(modelId: string): Promise<number[]> {
     const components = await model_components_db.where("id").equals(modelId).toArray();
-    return components.map((component) => Math.trunc(Number(component.viewer_id)));
+    return components.map((component: Readonly<ModelComponentRecord>) =>
+      Math.trunc(Number(component.viewer_id)),
+    );
   }
   async function getMeshComponentsViewerIds(
     modelId: string,
-    meshComponentGeodeIds: string[],
+    meshComponentGeodeIds: readonly string[],
   ): Promise<number[]> {
     const components = await model_components_db
       .where("[id+geode_id]")
       .anyOf(meshComponentGeodeIds.map((geode_id) => [modelId, geode_id]))
       .toArray();
-    return components.map((component) => Math.trunc(Number(component.viewer_id)));
+    return components.map((component: Readonly<ModelComponentRecord>) =>
+      Math.trunc(Number(component.viewer_id)),
+    );
   }
-  async function exportStores() {
+  async function exportStores(): Promise<{
+    items: DataItem[];
+    modelComponents: ModelComponentRecord[];
+    modelComponentsRelations: ModelComponentRelationRecord[];
+  }> {
     const items = await data_db.toArray();
     const modelComponents = await model_components_db.toArray();
     const modelComponentsRelations = await model_components_relation_db.toArray();
@@ -302,9 +341,11 @@ export const useDataStore = defineStore("data", () => {
     await model_components_relation_db.clear();
   }
 
+  // Dexie's bulkPut expects mutable arrays, so this snapshot parameter can't deeply satisfy
+  // The prefer-readonly-parameter-types rule; same pattern as app/utils/import_workflow.ts.
   async function importStores(snapshot: {
-    modelComponents: ModelComponentRecord[];
-    modelComponentsRelations: ModelComponentRelationRecord[];
+    readonly modelComponents: readonly ModelComponentRecord[];
+    readonly modelComponentsRelations: readonly ModelComponentRelationRecord[];
   }): Promise<void> {
     await clear();
     await model_components_db.bulkPut(snapshot.modelComponents);
diff --git a/app/stores/data_helpers/collections.ts b/app/stores/data_helpers/collections.ts
index 9387cbf4..f7d1cdb8 100644
--- a/app/stores/data_helpers/collections.ts
+++ b/app/stores/data_helpers/collections.ts
@@ -1,15 +1,10 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { liveQuery } from "dexie";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Table } from "dexie";
+import { type FormattedComponent, type ModelComponentRecord, useDataMesh } from "./mesh.js";
 import { MESH_COMPONENT_TYPES } from "@ogw_front/utils/default_styles";
-import { database } from "@ogw_internal/database/database.js";
-import { useDataMesh } from "./mesh.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { FormattedComponent, ModelComponentRecord } from "./mesh.js";
-import { useObservable } from "@vueuse/rxjs";
 import type { Observable } from "rxjs";
+import type { Ref } from "vue";
+import { getTable } from "@ogw_internal/database/database.js";
+import { liveQuery } from "dexie";
+import { useObservable } from "@vueuse/rxjs";
 
 interface ModelComponentRelationRecord {
   id: string;
@@ -19,13 +14,13 @@ interface ModelComponentRelationRecord {
 }
 
 interface CollectionComponent extends FormattedComponent {
-  children: FormattedComponent[];
+  readonly children: readonly FormattedComponent[];
 }
 
 interface CollectionComponentGroup {
   id: string;
   title: string;
-  children: CollectionComponent[];
+  readonly children: readonly CollectionComponent[];
 }
 
 function pluralize(type: string): string {
@@ -35,22 +30,28 @@ function pluralize(type: string): string {
   return `${type}s`;
 }
 
-export function useDataCollections() {
-  const model_components_db = database.model_components as unknown as Table<
-    ModelComponentRecord,
-    string
-  >;
-  const model_components_relation_db = database.model_components_relation as unknown as Table<
-    ModelComponentRelationRecord,
-    string
-  >;
+// oxlint-disable-next-line eslint/max-lines-per-function
+export function useDataCollections(): {
+  hasCollectionComponents: typeof hasCollectionComponents;
+  getAllCollectionComponents: typeof getAllCollectionComponents;
+  fetchAllCollectionComponents: typeof fetchAllCollectionComponents;
+  formatedCollectionComponents: typeof formatedCollectionComponents;
+  refFormatedCollectionComponents: typeof refFormatedCollectionComponents;
+} {
+  const model_components_db = getTable<ModelComponentRecord>("model_components");
+  const model_components_relation_db = getTable<ModelComponentRelationRecord>(
+    "model_components_relation",
+  );
   const { getAllMeshComponents } = useDataMesh();
 
   async function hasCollectionComponents(modelId: string): Promise<boolean> {
     const count = await model_components_db
       .where("id")
       .equals(modelId)
-      .and((component) => !MESH_COMPONENT_TYPES.includes(component.type))
+      .and(
+        (component: Readonly<ModelComponentRecord>) =>
+          !MESH_COMPONENT_TYPES.includes(component.type),
+      )
       .count();
     return count > 0;
   }
@@ -58,8 +59,11 @@ export function useDataCollections() {
   async function getAllCollectionComponents(modelId: string): Promise<FormattedComponent[]> {
     const items = await model_components_db.where("id").equals(modelId).toArray();
     return items
-      .filter((component) => !MESH_COMPONENT_TYPES.includes(component.type))
-      .map((component) => ({
+      .filter(
+        (component: Readonly<ModelComponentRecord>) =>
+          !MESH_COMPONENT_TYPES.includes(component.type),
+      )
+      .map((component: Readonly<ModelComponentRecord>) => ({
         id: component.geode_id,
         title: component.name,
         category: component.type,
@@ -81,14 +85,15 @@ export function useDataCollections() {
 
     const byType: Record<string, CollectionComponent[]> = {};
     for (const component of components) {
-      if (!byType[component.category]) {
-        byType[component.category] = [];
-      }
+      byType[component.category] ??= [];
       const itemRelations = relations.filter(
-        (relation) => relation.parent === component.id && relation.type === "collection",
+        (relation: Readonly<ModelComponentRelationRecord>) =>
+          relation.parent === component.id && relation.type === "collection",
       );
       const children = itemRelations
-        .map((relation) => meshComponentsById[relation.child])
+        .map(
+          (relation: Readonly<ModelComponentRelationRecord>) => meshComponentsById[relation.child],
+        )
         .filter((child): child is FormattedComponent => Boolean(child));
       byType[component.category]?.push({
         ...component,
@@ -105,7 +110,7 @@ export function useDataCollections() {
     const collectionTypes = Object.keys(byType);
 
     return collectionTypes
-      .filter((type) => byType[type] && (byType[type]?.length ?? 0) > 0)
+      .filter((type) => (byType[type]?.length ?? 0) > 0)
       .map((type) => ({
         id: type,
         title: pluralize(type),
@@ -113,15 +118,16 @@ export function useDataCollections() {
       }));
   }
 
-  function refFormatedCollectionComponents(modelId: string) {
-    // Dexie's liveQuery() returns Dexie's own minimal Observable shape, not an
-    // Actual rxjs Observable instance (useObservable's declared parameter type);
-    // The two are structurally close enough at runtime (vueuse only calls
-    // `.subscribe`) but not identical, hence the cast.
+  function refFormatedCollectionComponents(
+    modelId: string,
+  ): Readonly<Ref<CollectionComponentGroup[] | undefined>> {
     return useObservable(
-      liveQuery(() => formatedCollectionComponents(modelId)) as unknown as Observable<
-        CollectionComponentGroup[]
-      >,
+      // Dexie's liveQuery returns its own Observable-like type, not rxjs's Observable, so bridging needs a cast.
+      liveQuery(async () => {
+        const groups = await formatedCollectionComponents(modelId);
+        return groups;
+        // oxlint-disable-next-line no-unsafe-type-assertion
+      }) as unknown as Observable<CollectionComponentGroup[]>,
       {
         initialValue: undefined,
       },
diff --git a/app/stores/data_helpers/mesh.ts b/app/stores/data_helpers/mesh.ts
index 28a73501..4a822872 100644
--- a/app/stores/data_helpers/mesh.ts
+++ b/app/stores/data_helpers/mesh.ts
@@ -1,11 +1,7 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { liveQuery } from "dexie";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Table } from "dexie";
+import { type Table, liveQuery } from "dexie";
+import type { Observable } from "rxjs";
 import { database } from "@ogw_internal/database/database.js";
 import { useObservable } from "@vueuse/rxjs";
-import type { Observable } from "rxjs";
 
 interface ModelComponentRecord {
   id: string;
@@ -17,20 +13,20 @@ interface ModelComponentRecord {
 }
 
 interface FormattedComponent {
-  id: string;
-  title: string;
-  category: string;
-  viewer_id: number;
-  is_active: boolean;
+  readonly id: string;
+  readonly title: string;
+  readonly category: string;
+  readonly viewer_id: number;
+  readonly is_active: boolean;
 }
 
 interface FormattedComponentGroup {
   id: string;
   title: string;
-  children: FormattedComponent[];
+  readonly children: readonly FormattedComponent[];
 }
 
-function toFormattedComponent(meshComponent: ModelComponentRecord): FormattedComponent {
+function toFormattedComponent(meshComponent: Readonly<ModelComponentRecord>): FormattedComponent {
   return {
     id: meshComponent.geode_id,
     title: meshComponent.name,
@@ -40,7 +36,20 @@ function toFormattedComponent(meshComponent: ModelComponentRecord): FormattedCom
   };
 }
 
-export function useDataMesh() {
+// oxlint-disable-next-line eslint/max-lines-per-function
+export function useDataMesh(): {
+  formatedMeshComponents: typeof formatedMeshComponents;
+  refFormatedMeshComponents: typeof refFormatedMeshComponents;
+  getMeshComponentsByType: typeof getMeshComponentsByType;
+  getAllMeshComponents: typeof getAllMeshComponents;
+  fetchAllMeshComponents: typeof fetchAllMeshComponents;
+  getMeshComponentGeodeIds: typeof getMeshComponentGeodeIds;
+  getCornersGeodeIds: typeof getCornersGeodeIds;
+  getLinesGeodeIds: typeof getLinesGeodeIds;
+  getSurfacesGeodeIds: typeof getSurfacesGeodeIds;
+  getBlocksGeodeIds: typeof getBlocksGeodeIds;
+} {
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime.
   const model_components_db = database.model_components as unknown as Table<
     ModelComponentRecord,
     string
@@ -57,10 +66,8 @@ export function useDataMesh() {
 
     const componentsByType: Record<string, ModelComponentRecord[]> = {};
     for (const component_item of items) {
-      if (componentTitles[component_item.type]) {
-        if (!componentsByType[component_item.type]) {
-          componentsByType[component_item.type] = [];
-        }
+      if (componentTitles[component_item.type] !== undefined) {
+        componentsByType[component_item.type] ??= [];
         componentsByType[component_item.type]?.push(component_item);
       }
     }
@@ -70,19 +77,21 @@ export function useDataMesh() {
       .map((type) => ({
         id: type,
         title: componentTitles[type] ?? type,
-        children: (componentsByType[type] ?? []).map((item) => toFormattedComponent(item)),
+        children: (componentsByType[type] ?? []).map((item: Readonly<ModelComponentRecord>) =>
+          toFormattedComponent(item),
+        ),
       }));
   }
 
-  function refFormatedMeshComponents(modelId: string) {
-    // Dexie's liveQuery() returns Dexie's own minimal Observable shape, not an
-    // Actual rxjs Observable instance (useObservable's declared parameter type);
-    // The two are structurally close enough at runtime (vueuse only calls
-    // `.subscribe`) but not identical, hence the cast.
+  function refFormatedMeshComponents(
+    modelId: string,
+  ): Readonly<Ref<FormattedComponentGroup[] | undefined>> {
     return useObservable(
-      liveQuery(() => formatedMeshComponents(modelId)) as unknown as Observable<
-        FormattedComponentGroup[]
-      >,
+      liveQuery(async () => {
+        const components = await formatedMeshComponents(modelId);
+        return components;
+        // oxlint-disable-next-line no-unsafe-type-assertion
+      }) as unknown as Observable<FormattedComponentGroup[]>,
       {
         initialValue: undefined,
       },
@@ -97,12 +106,12 @@ export function useDataMesh() {
       .where("[id+type]")
       .equals([modelId, type])
       .toArray();
-    return components.map((item) => toFormattedComponent(item));
+    return components.map((item: Readonly<ModelComponentRecord>) => toFormattedComponent(item));
   }
 
   async function getAllMeshComponents(modelId: string): Promise<FormattedComponent[]> {
     const items = await model_components_db.where("id").equals(modelId).toArray();
-    return items.map((item) => toFormattedComponent(item));
+    return items.map((item: Readonly<ModelComponentRecord>) => toFormattedComponent(item));
   }
 
   async function fetchAllMeshComponents(
@@ -111,9 +120,7 @@ export function useDataMesh() {
     const components = await getAllMeshComponents(modelId);
     const byType: Record<string, FormattedComponent[]> = {};
     for (const component of components) {
-      if (!byType[component.category]) {
-        byType[component.category] = [];
-      }
+      byType[component.category] ??= [];
       byType[component.category]?.push(component);
     }
     return byType;
@@ -124,23 +131,27 @@ export function useDataMesh() {
       .where("[id+type]")
       .equals([modelId, type])
       .toArray();
-    return components.map((component) => component.geode_id);
+    return components.map((component: Readonly<ModelComponentRecord>) => component.geode_id);
   }
 
   async function getCornersGeodeIds(modelId: string): Promise<string[]> {
-    return await getMeshComponentGeodeIds(modelId, "Corner");
+    const geodeIds = await getMeshComponentGeodeIds(modelId, "Corner");
+    return geodeIds;
   }
 
   async function getLinesGeodeIds(modelId: string): Promise<string[]> {
-    return await getMeshComponentGeodeIds(modelId, "Line");
+    const geodeIds = await getMeshComponentGeodeIds(modelId, "Line");
+    return geodeIds;
   }
 
   async function getSurfacesGeodeIds(modelId: string): Promise<string[]> {
-    return await getMeshComponentGeodeIds(modelId, "Surface");
+    const geodeIds = await getMeshComponentGeodeIds(modelId, "Surface");
+    return geodeIds;
   }
 
   async function getBlocksGeodeIds(modelId: string): Promise<string[]> {
-    return await getMeshComponentGeodeIds(modelId, "Block");
+    const geodeIds = await getMeshComponentGeodeIds(modelId, "Block");
+    return geodeIds;
   }
 
   return {
diff --git a/app/stores/data_style.ts b/app/stores/data_style.ts
index fcdf9d25..46875536 100644
--- a/app/stores/data_style.ts
+++ b/app/stores/data_style.ts
@@ -1,54 +1,63 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type {
+  ModelComponentStyle,
+  ModelComponentTypeStyle,
+  ObjectStyle,
+} from "@ogw_internal/stores/data_style/types";
+import type { Table } from "dexie";
 import { database } from "@ogw_internal/database/database.js";
 import { getDefaultStyle } from "@ogw_front/utils/default_styles";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useMeshStyle } from "@ogw_internal/stores/data_style/mesh/index";
 import { useModelStyle } from "@ogw_internal/stores/data_style/model/index";
-import type {
-  ModelComponentStyle,
-  ModelComponentTypeStyle,
-  ObjectStyle,
-} from "@ogw_internal/stores/data_style/types";
 
 interface DataStyleSnapshot {
-  styles: Record<string, ObjectStyle>;
-  componentStyles: Record<string, ModelComponentStyle>;
-  modelComponentTypeStyles: Record<string, ModelComponentTypeStyle>;
+  readonly styles: Readonly<Record<string, Readonly<ObjectStyle>>>;
+  readonly componentStyles: Readonly<Record<string, Readonly<ModelComponentStyle>>>;
+  readonly modelComponentTypeStyles: Readonly<Record<string, Readonly<ModelComponentTypeStyle>>>;
 }
 
-// The database's table map is dynamically assembled at runtime (see internal/database/database.ts), so `noUncheckedIndexedAccess` sees these as possibly undefined even though they're always registered before this store is used; guard defensively rather than asserting.
-function requireTable<Table>(table: Table | undefined, name: string): Table {
-  if (!table) {
+// The database's table map is dynamically assembled at runtime (see internal/database/database.ts), so its exported type is a loose `{}`; cast it to the shape it actually has at runtime rather than widening every call site.
+type DatabaseTables = Record<string, Table<Record<string, unknown>, string> | undefined>;
+
+// `noUncheckedIndexedAccess` sees these as possibly undefined even though they're always registered before this store is used; guard defensively rather than asserting.
+function requireTable<TableValue>(table: TableValue | undefined, name: string): TableValue {
+  if (table === undefined) {
     throw new Error(`Database table not initialized: ${name}`);
   }
   return table;
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
 // oxlint-disable-next-line max-lines-per-function
 export const useDataStyleStore = defineStore("dataStyle", () => {
   const dataStyleState = useDataStyleState();
   const meshStyleStore = useMeshStyle();
   const modelStyleStore = useModelStyle();
   const dataStore = useDataStore();
-  const data_style_db = requireTable(database.data_style, "data_style");
+  // oxlint-disable-next-line no-unsafe-type-assertion -- the database Proxy is typed as `{}` at its export site; this cast documents its real runtime shape.
+  const typedDatabase = database as unknown as DatabaseTables;
+  const data_style_db = requireTable(typedDatabase.data_style, "data_style");
   const model_component_type_datastyle_db = requireTable(
-    database.model_component_type_datastyle,
+    typedDatabase.model_component_type_datastyle,
     "model_component_type_datastyle",
   );
   const component_datastyle_db = requireTable(
-    database.model_component_datastyle,
+    typedDatabase.model_component_datastyle,
     "model_component_datastyle",
   );
 
   async function addDataStyle(id: string, geode_object: string): Promise<void> {
+    const defaultStyle = getDefaultStyle(geode_object);
     await data_style_db.put(
-      structuredClone({ id, ...(getDefaultStyle(geode_object) as Record<string, unknown>) }),
+      structuredClone({ id, ...(isRecord(defaultStyle) ? defaultStyle : {}) }),
     );
   }
 
-  async function setVisibility(id: string, visibility: boolean) {
+  async function setVisibility(id: string, visibility: boolean): Promise<unknown> {
     const item = await dataStore.item(id);
     if (!(await dataStore.isItemViewable(item))) {
       return dataStyleState.mutateStyle(id, { visibility });
@@ -65,7 +74,7 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     throw new Error("Unknown viewer_type");
   }
 
-  async function applyDefaultStyle(id: string) {
+  async function applyDefaultStyle(id: string): Promise<unknown[]> {
     const item = await dataStore.item(id);
     if (!(await dataStore.isItemViewable(item))) {
       throw new Error(`applyDefaultStyle called for non-viewable item: ${id}`);
@@ -90,21 +99,32 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     };
   }
 
-  async function importStores(snapshot: DataStyleSnapshot): Promise<void> {
+  // oxlint-disable-next-line prefer-readonly-parameter-types -- ObjectStyle (external type) has a mutable index signature and mutable nested StyleValues fields that can't be marked readonly from here.
+  async function importStores(snapshot: Readonly<DataStyleSnapshot>): Promise<void> {
     const stylesSnapshot = snapshot.styles;
     const componentStylesSnapshot = snapshot.componentStyles;
     const modelComponentTypeStylesSnapshot = snapshot.modelComponentTypeStyles;
 
     await dataStyleState.clear();
 
-    const style_promises = Object.entries(stylesSnapshot).map(([id, style]) =>
-      data_style_db.put(structuredClone({ ...style, id })),
+    const style_promises = Object.entries(stylesSnapshot).map(
+      // oxlint-disable-next-line prefer-readonly-parameter-types -- same external ObjectStyle limitation as above.
+      async ([id, style]: readonly [string, Readonly<ObjectStyle>]) => {
+        const key = await data_style_db.put(structuredClone({ ...style, id }));
+        return key;
+      },
     );
-    const component_style_promises = Object.values(componentStylesSnapshot).map((style) =>
-      component_datastyle_db.put(structuredClone(style)),
+    const component_style_promises = Object.values(componentStylesSnapshot).map(
+      async (style: Readonly<ModelComponentStyle>) => {
+        const key = await component_datastyle_db.put(structuredClone(style));
+        return key;
+      },
     );
     const model_component_type_style_promises = Object.values(modelComponentTypeStylesSnapshot).map(
-      (style) => model_component_type_datastyle_db.put(structuredClone(style)),
+      async (style: Readonly<ModelComponentTypeStyle>) => {
+        const key = await model_component_type_datastyle_db.put(structuredClone(style));
+        return key;
+      },
     );
 
     await Promise.all([
@@ -114,7 +134,7 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     ]);
   }
 
-  function applyAllStylesFromState() {
+  async function applyAllStylesFromState(): Promise<void> {
     const ids = Object.keys(dataStyleState.styles.value);
     const promises = ids.map(async (id) => {
       const meta = await dataStore.item(id);
@@ -123,12 +143,12 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
       }
       const viewerType = meta.viewer_type;
       if (viewerType === "mesh") {
-        return meshStyleStore.applyMeshStyle(id);
+        await meshStyleStore.applyMeshStyle(id);
       } else if (viewerType === "model") {
-        return modelStyleStore.applyModelStyle(id);
+        await modelStyleStore.applyModelStyle(id);
       }
     });
-    return Promise.all(promises);
+    await Promise.all(promises);
   }
 
   return {
@@ -143,3 +163,5 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     ...modelStyleStore,
   };
 });
+
+export type { DataStyleSnapshot };
diff --git a/app/stores/feedback.ts b/app/stores/feedback.ts
index 7b12dd1b..1ca36c68 100644
--- a/app/stores/feedback.ts
+++ b/app/stores/feedback.ts
@@ -21,9 +21,9 @@ export const useFeedbackStore = defineStore("feedback", {
     feedbacks_timeout_miliseconds: DEFAULT_FEEDBACKS_TIMEOUT_SECONDS * MILLISECONDS_IN_SECOND,
   }),
   actions: {
-    async add_error(code: number, route: string, name: string, description: string) {
+    add_error(code: number, route: string, name: string, description: string) {
       const feedbackId = uuidv4();
-      await this.feedbacks.push({
+      this.feedbacks.push({
         id: feedbackId,
         type: "error",
         code,
@@ -35,9 +35,9 @@ export const useFeedbackStore = defineStore("feedback", {
         this.delete_feedback(feedbackId);
       }, this.feedbacks_timeout_miliseconds);
     },
-    async add_success(description: string) {
+    add_success(description: string) {
       const feedbackId = uuidv4();
-      await this.feedbacks.push({
+      this.feedbacks.push({
         id: feedbackId,
         type: "success",
         description,
@@ -46,9 +46,9 @@ export const useFeedbackStore = defineStore("feedback", {
         this.delete_feedback(feedbackId);
       }, this.feedbacks_timeout_miliseconds);
     },
-    async add_warning(description: string) {
+    add_warning(description: string) {
       const feedbackId = uuidv4();
-      await this.feedbacks.push({
+      this.feedbacks.push({
         id: feedbackId,
         type: "warning",
         description,
diff --git a/app/stores/hybrid_viewer.ts b/app/stores/hybrid_viewer.ts
index 8a3ea837..485bd206 100644
--- a/app/stores/hybrid_viewer.ts
+++ b/app/stores/hybrid_viewer.ts
@@ -1,35 +1,30 @@
+import {
+  type ViewStreamLike,
+  useHybridViewerViewport,
+} from "@ogw_internal/stores/hybrid_viewer/viewport";
 import {
   applySnapshot,
   getCameraOptions,
   useHybridViewerCamera,
 } from "@ogw_internal/stores/hybrid_viewer/camera";
 import { BACKGROUND_COLOR } from "@ogw_internal/stores/hybrid_viewer/constants";
+import type { CameraOptions } from "@ogw_internal/stores/hybrid_viewer/vtk_types";
 import { useHybridViewerBrightness } from "@ogw_internal/stores/hybrid_viewer/brightness";
+import { useHybridViewerCore } from "@ogw_internal/stores/hybrid_viewer/core";
 import { useHybridViewerFilters } from "@ogw_internal/stores/hybrid_viewer/filters";
 import { useHybridViewerHighlight } from "@ogw_internal/stores/hybrid_viewer/highlight";
 import { useHybridViewerRuler } from "@ogw_internal/stores/hybrid_viewer/ruler";
 import { useHybridViewerScene } from "@ogw_internal/stores/hybrid_viewer/scene";
-import { useHybridViewerViewport } from "@ogw_internal/stores/hybrid_viewer/viewport";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { vtkGenericRenderWindow as VtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
 
 import { Status } from "@ogw_front/utils/status";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-
-interface GenericRenderWindowHolder {
-  value?: VtkGenericRenderWindow;
-}
-
 // oxlint-disable max-lines-per-function, max-statements
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
   const viewerStore = useViewerStore();
-  const genericRenderWindow = reactive<GenericRenderWindowHolder>({});
-  const status = ref(Status.NOT_CREATED);
-  const is_moving = ref(false);
-  const is_picking = ref(false);
+  const { genericRenderWindow, status, is_moving, is_picking, remoteRender } =
+    useHybridViewerCore();
   let imageStyle: CSSStyleDeclaration | undefined = undefined;
 
   const brightnessStore = useHybridViewerBrightness();
@@ -46,11 +41,14 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     if (!genericRenderWindow.value) {
       return;
     }
+    // oxlint-disable-next-line no-unsafe-assignment -- vtk.js has no types for getApiSpecificRenderWindow(); narrowed below.
     const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
-    const canvas = (
-      webGLRenderWindow as unknown as { getCanvas: () => HTMLCanvasElement }
-    ).getCanvas();
-    if (canvas && canvas.parentElement) {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+    const openGLRenderWindow = webGLRenderWindow as unknown as {
+      getCanvas: () => HTMLCanvasElement;
+    };
+    const canvas = openGLRenderWindow.getCanvas();
+    if (canvas.parentElement) {
       canvas.parentElement.style.cursor = value ? "crosshair" : "default";
     }
   });
@@ -64,22 +62,34 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
       background: BACKGROUND_COLOR,
       listenWindowResize: false,
     });
-    const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow() as unknown as {
-      getReferenceByName: (name: string) => { style: CSSStyleDeclaration };
-      setBackgroundImage: (image: unknown) => void;
-    };
+    const webGLRenderWindow =
+      // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+      genericRenderWindow.value.getApiSpecificRenderWindow() as unknown as {
+        getReferenceByName: (name: string) => { style: CSSStyleDeclaration };
+        setBackgroundImage: (image: unknown) => void;
+      };
     imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style;
-    Object.assign(imageStyle, { transition: "opacity 0.1s ease-in", zIndex: 1 });
+    Object.assign(imageStyle, {
+      transition: "opacity 0.1s ease-in",
+      zIndex: 1,
+    });
     await viewerStore.ws_connect();
-    const imageStream = (
-      viewerStore.client as unknown as { getImageStream: () => any }
-    ).getImageStream();
+    // oxlint-disable-next-line no-unsafe-type-assertion -- trusted @kitware/vtk.js WebSocket client API boundary.
+    const clientApi = viewerStore.client as unknown as {
+      getImageStream: () => {
+        createViewStream: (id: string) => ViewStreamLike;
+      };
+    };
+    const imageStream = clientApi.getImageStream();
     viewportStore.viewStream.value = imageStream.createViewStream("-1");
-    viewportStore.viewStream.value?.onImageReady((event: { image: unknown }) => {
+    viewportStore.viewStream.value?.onImageReady((event: Readonly<{ image: unknown }>) => {
       if (is_moving.value) {
         return;
       }
-      brightnessStore.latestImage.value = event.image as typeof brightnessStore.latestImage.value;
+      // oxlint-disable no-unsafe-type-assertion -- image payload shape is guaranteed by the viewer's onImageReady contract.
+      const latestImage = event.image as typeof brightnessStore.latestImage.value;
+      // oxlint-enable no-unsafe-type-assertion
+      brightnessStore.latestImage.value = latestImage;
       webGLRenderWindow.setBackgroundImage(event.image);
       if (imageStyle) {
         imageStyle.opacity = "1";
@@ -94,36 +104,15 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     status.value = Status.CREATED;
   }
 
-  let renderPromise: Promise<void> | undefined = undefined;
-  let renderPending = false;
-
-  function remoteRender(): Promise<void> {
-    if (renderPromise) {
-      renderPending = true;
-      return renderPromise;
-    }
-
-    renderPromise = (async () => {
-      try {
-        const schema = viewer_schemas.opengeodeweb_viewer.viewer.render;
-        await viewerStore.request({ schema });
-      } finally {
-        renderPromise = undefined;
-        if (renderPending) {
-          renderPending = false;
-          await remoteRender();
-        }
-      }
-    })();
-    return renderPromise;
-  }
-
-  function exportStores() {
+  function exportStores(): {
+    zScale: number;
+    camera_options: CameraOptions | Record<string, unknown>;
+  } {
     const renderer = genericRenderWindow.value?.getRenderer();
     const camera = renderer?.getActiveCamera();
     return {
       zScale: sceneStore.zScale.value,
-      camera_options: (camera ? getCameraOptions(camera) : undefined) || cameraStore.camera_options,
+      camera_options: (camera ? getCameraOptions(camera) : undefined) ?? cameraStore.camera_options,
     };
   }
 
diff --git a/app/stores/infra.ts b/app/stores/infra.ts
index 4c1a8a35..ce404d40 100644
--- a/app/stores/infra.ts
+++ b/app/stores/infra.ts
@@ -1,17 +1,17 @@
 import { Status } from "@ogw_front/utils/status";
 import { appMode } from "@ogw_shared/app_mode";
-import { registerRunningExtensions } from "@ogw_front/utils/extension";
 import { setAppBaseUrl } from "@ogw_shared/scripts";
-import { useAppStore } from "@ogw_front/stores/app";
 import { useCloudStore } from "@ogw_front/stores/cloud";
 
-export interface Microservice {
-  $id: string;
-  status?: string;
-  is_busy?: boolean;
-  launch?: (params: Record<string, unknown>) => Promise<unknown>;
-  connect: () => Promise<void>;
-  [key: string]: unknown;
+interface ElectronApi {
+  electronAPI: {
+    project_folder_path: (args: Readonly<{ projectFolderPath: string }>) => void;
+  };
+}
+
+declare global {
+  // oxlint-disable-next-line no-var -- required for global augmentation
+  var electronAPI: ElectronApi["electronAPI"];
 }
 
 export const useInfraStore = defineStore("infra", {
@@ -23,82 +23,90 @@ export const useInfraStore = defineStore("infra", {
   }),
   getters: {
     microservices_connected(): boolean {
-      console.log("microservices", this.microservices);
-      return this.microservices.every((store) => store.status === Status.CONNECTED);
+      return this.microservices.every(
+        (store: Readonly<Microservice>) => store.status === Status.CONNECTED,
+      );
     },
     microservices_busy(): boolean {
-      return this.microservices.some((store) => store.is_busy === true);
+      return this.microservices.some((store: Readonly<Microservice>) => store.is_busy === true);
     },
   },
   actions: {
-    register_microservice(store: Microservice) {
+    register_microservice(store: Readonly<Microservice>) {
       const store_name = store.$id;
-      console.log("[INFRA] Registering microservice:", store_name);
 
-      if (!this.microservices.some((microservice) => microservice.$id === store_name)) {
+      if (
+        !this.microservices.some(
+          (microservice: Readonly<Microservice>) => microservice.$id === store_name,
+        )
+      ) {
         this.microservices.push(store);
-        console.log("[INFRA] Microservice registered:", store_name);
       }
     },
     unregister_microservice(microserviceId: string) {
-      console.log("[INFRA] Unregistering microservice:", microserviceId);
       this.microservices = this.microservices.filter(
-        (microservice) => microservice.$id !== microserviceId,
+        (microservice: Readonly<Microservice>) => microservice.$id !== microserviceId,
       );
-      console.log("[INFRA] Microservice unregistered:", microserviceId);
     },
-    create_backend(email?: string) {
-      console.log("[INFRA] Starting create_backend - Mode:", this.app_mode);
-      console.log(
-        "[INFRA] Registered microservices:",
-        this.microservices.map((store) => store.$id),
-      );
+    async create_backend(email?: string) {
       if (this.status === Status.CREATED) {
-        return;
+        return undefined;
       }
-      return navigator.locks.request("infra.create_backend", async () => {
+      await navigator.locks.request("infra.create_backend", async () => {
         if (this.status === Status.CREATED) {
           return;
         }
         this.status = Status.CREATING;
-        console.log("[INFRA] Lock granted for create_backend");
         if (this.app_mode === appMode.CLOUD) {
           const cloudStore = useCloudStore();
           await cloudStore.launch(email ?? "");
         } else {
+          const { useAppStore } = await import("@ogw_front/stores/app");
           const appStore = useAppStore();
           await appStore.createProjectFolder();
           if (this.app_mode === appMode.DESKTOP) {
-            (globalThis as any).electronAPI.project_folder_path({
+            globalThis.electronAPI.project_folder_path({
               projectFolderPath: appStore.projectFolderPath,
             });
           }
           await setAppBaseUrl(appStore.base_url);
-          const microservices_with_launch = this.microservices.filter((store) => store.launch);
-          const launch_promises = microservices_with_launch.map((store) =>
-            store.launch!({ projectFolderPath: appStore.projectFolderPath }),
+          const microservices_with_launch = this.microservices.filter(
+            (store: Readonly<Microservice>) => store.launch,
           );
+          const launch_promises = microservices_with_launch.map(
+            async (store: Readonly<Microservice>) => {
+              const result = await store.launch?.({
+                projectFolderPath: appStore.projectFolderPath,
+              });
+              return result;
+            },
+          );
+          const { registerRunningExtensions } = await import("@ogw_front/utils/extension");
           launch_promises.push(registerRunningExtensions());
           await Promise.all(launch_promises);
         }
         this.status = Status.CREATED;
-        console.log("[INFRA] Backend created successfully");
         return this.create_connection();
       });
+      return undefined;
     },
     async create_connection() {
-      console.log("[INFRA] Starting create_connection");
       await Promise.all(
-        this.microservices.map(async (store) => {
-          console.log("[INFRA] Connecting to microservice:", store.$id);
+        this.microservices.map(async (store: Readonly<Microservice>) => {
           await store.connect();
-          console.log("[INFRA] Microservice connected:", store.$id);
         }),
       );
-      console.log("[INFRA] All microservices connected");
     },
   },
   share: {
     omit: ["microservices"],
   },
 });
+
+export interface Microservice {
+  $id: string;
+  status?: string;
+  is_busy?: boolean;
+  launch?: (params: Readonly<Record<string, unknown>>) => Promise<unknown>;
+  connect: () => Promise<void>;
+}
diff --git a/app/stores/menu.ts b/app/stores/menu.ts
index 6500e9b3..dc4caa76 100644
--- a/app/stores/menu.ts
+++ b/app/stores/menu.ts
@@ -48,6 +48,17 @@ interface MenuMetaData {
   [key: string]: unknown;
 }
 
+interface OpenMenuOptions {
+  readonly id: string;
+  readonly x: number | undefined;
+  readonly y: number | undefined;
+  readonly width: number;
+  readonly height: number;
+  readonly top: number;
+  readonly left: number;
+  readonly meta_data: Readonly<MenuMetaData> | undefined;
+}
+
 const PointSet_menu = [PointSetPointsOptions];
 
 const EdgedCurve_menu = [EdgedCurvePointsOptions, EdgedCurveEdgesOptions];
@@ -146,10 +157,16 @@ export const useMenuStore = defineStore("menu", () => {
     objectType: string | undefined,
     geodeObject: string | undefined,
   ): MenuItems {
-    if (!objectType || !geodeObject || !menus.value[objectType]) {
+    if (
+      objectType === undefined ||
+      objectType === "" ||
+      geodeObject === undefined ||
+      geodeObject === "" ||
+      !menus.value[objectType]
+    ) {
       return [];
     }
-    return menus.value[objectType]?.[geodeObject] || [];
+    return menus.value[objectType]?.[geodeObject] ?? [];
   }
 
   function closeMenu(): void {
@@ -161,17 +178,9 @@ export const useMenuStore = defineStore("menu", () => {
     display_menu.value = false;
   }
 
-  async function openMenu(
-    id: string,
-    x: number | undefined,
-    y: number | undefined,
-    width: number,
-    height: number,
-    top: number,
-    left: number,
-    meta_data: MenuMetaData | undefined,
-  ): Promise<void> {
-    await closeMenu();
+  function openMenu(options: OpenMenuOptions): void {
+    const { id, x, y, width, height, top, left, meta_data } = options;
+    closeMenu();
 
     if (meta_data) {
       const items = getMenuItems(meta_data.viewer_type, meta_data.geode_object_type);
@@ -181,7 +190,7 @@ export const useMenuStore = defineStore("menu", () => {
     }
 
     current_id.value = id;
-    current_meta_data.value = meta_data || {};
+    current_meta_data.value = meta_data ?? {};
 
     if (x !== undefined && y !== undefined) {
       menuX.value = x;
diff --git a/app/stores/treeview.ts b/app/stores/treeview.ts
index c9ddcbc1..f14dc746 100644
--- a/app/stores/treeview.ts
+++ b/app/stores/treeview.ts
@@ -55,6 +55,22 @@ function defaultOpenedViews(): OpenedView[] {
   return [{ type: "object", id: "main", title: "Objects", scrollTop: 0, opened: [] }];
 }
 
+type ReadonlyOpenedView = Readonly<Omit<OpenedView, "opened">> & {
+  readonly opened: readonly string[];
+};
+type ReadonlyTreeviewGroup = Readonly<Omit<TreeviewGroup, "children">> & {
+  readonly children: readonly Readonly<TreeviewChild>[];
+};
+type ReadonlyTreeviewSnapshot = Readonly<{
+  opened_views?: readonly ReadonlyOpenedView[];
+  panelWidth?: number;
+  additionalPanelWidth?: number;
+  rowHeights?: readonly number[];
+  selectionIds?: readonly string[];
+  selection?: readonly (string | Readonly<{ id: string }>)[];
+}>;
+
+// oxlint-disable-next-line max-lines-per-function, max-statements
 export const useTreeviewStore = defineStore("treeview", () => {
   const items = ref<TreeviewGroup[]>([]);
   const selection = ref<string[]>([]);
@@ -66,10 +82,12 @@ export const useTreeviewStore = defineStore("treeview", () => {
   const pendingSelectionIds = ref<string[]>([]);
   const rowHeights = ref<number[]>([]);
 
-  const treeview_config_db = database.treeview_config as unknown as Table<
-    TreeviewConfigRecord,
-    string
-  >;
+  // The database's table map is dynamically assembled at runtime (see internal/database/database.ts), so its exported type is a loose `{}`; cast it to the shape it actually has at runtime rather than widening every call site.
+  type DatabaseTables = Record<string, unknown>;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+  const typedDatabase = database as unknown as DatabaseTables;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- database's table map is dynamically typed at runtime; see comment above.
+  const treeview_config_db = typedDatabase.treeview_config as Table<TreeviewConfigRecord, string>;
 
   async function loadConfig(): Promise<void> {
     try {
@@ -77,10 +95,10 @@ export const useTreeviewStore = defineStore("treeview", () => {
       if (config?.opened_views) {
         opened_views.value = config.opened_views;
       }
-      if (config?.panelWidth) {
+      if (config?.panelWidth !== undefined && config.panelWidth !== 0) {
         panelWidth.value = config.panelWidth;
       }
-      if (config?.additionalPanelWidth) {
+      if (config?.additionalPanelWidth !== undefined && config.additionalPanelWidth !== 0) {
         additionalPanelWidth.value = config.additionalPanelWidth;
       }
       if (config?.selectionIds) {
@@ -90,21 +108,24 @@ export const useTreeviewStore = defineStore("treeview", () => {
         rowHeights.value = config.rowHeights;
       }
     } catch (error) {
+      // oxlint-disable-next-line no-console -- surfaces persistence failures during local development.
       console.error("Failed to load treeview config:", error);
     }
   }
+  // oxlint-disable-next-line typescript/no-floating-promises -- loadConfig catches its own errors internally.
   loadConfig();
 
   watch(
     [opened_views, panelWidth, additionalPanelWidth, selection, rowHeights],
     () => {
-      // oxlint-disable-next-line unicorn/prefer-structured-clone
-      const clean_opened_views = JSON.parse(JSON.stringify(opened_views.value));
-      // oxlint-disable-next-line unicorn/prefer-structured-clone
-      const clean_selectionIds = JSON.parse(JSON.stringify(selection.value));
-      // oxlint-disable-next-line unicorn/prefer-structured-clone
-      const clean_rowHeights = JSON.parse(JSON.stringify(rowHeights.value));
-
+      // oxlint-disable-next-line unicorn/prefer-structured-clone, no-unsafe-type-assertion -- JSON round-trip of a known-shape ref; result matches the source type.
+      const clean_opened_views = JSON.parse(JSON.stringify(opened_views.value)) as OpenedView[];
+      // oxlint-disable-next-line unicorn/prefer-structured-clone, no-unsafe-type-assertion -- JSON round-trip of a known-shape ref; result matches the source type.
+      const clean_selectionIds = JSON.parse(JSON.stringify(selection.value)) as string[];
+      // oxlint-disable-next-line unicorn/prefer-structured-clone, no-unsafe-type-assertion -- JSON round-trip of a known-shape ref; result matches the source type.
+      const clean_rowHeights = JSON.parse(JSON.stringify(rowHeights.value)) as number[];
+
+      // oxlint-disable-next-line typescript/no-floating-promises -- best-effort persistence; failures aren't actionable here.
       treeview_config_db.put({
         id: "main",
         opened_views: clean_opened_views,
@@ -118,14 +139,14 @@ export const useTreeviewStore = defineStore("treeview", () => {
   );
 
   function closeView(id: string): void {
-    opened_views.value = opened_views.value.filter((view) => view.id !== id);
+    opened_views.value = opened_views.value.filter((view: ReadonlyOpenedView) => view.id !== id);
   }
 
-  watch(selection, (current, previous) => {
+  watch(selection, (current: readonly string[], previous: readonly string[]) => {
     const { removed } = compareSelections(current, previous);
     for (const id of removed) {
       const index = opened_views.value.findIndex(
-        (view) => view.type === "component" && view.id === id,
+        (view: ReadonlyOpenedView) => view.type === "component" && view.id === id,
       );
       if (index !== -1) {
         closeView(id);
@@ -134,7 +155,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
   });
 
   function toggleView(id: string): void {
-    const index = opened_views.value.findIndex((view) => view.id === id);
+    const index = opened_views.value.findIndex((view: ReadonlyOpenedView) => view.id === id);
     if (index !== -1) {
       closeView(id);
     } else if (id === "main") {
@@ -170,7 +191,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     if (!found) {
       items.value.push({ id: geodeObjectType, title: geodeObjectType, children: [child] });
       const sort_options = { numeric: true, sensitivity: "base" as const };
-      items.value.sort((groupA, groupB) =>
+      items.value.sort((groupA: ReadonlyTreeviewGroup, groupB: ReadonlyTreeviewGroup) =>
         groupA.title.localeCompare(groupB.title, undefined, sort_options),
       );
     }
@@ -199,12 +220,13 @@ export const useTreeviewStore = defineStore("treeview", () => {
     id: string,
     title: string | undefined,
     geodeObjectType: string,
-    viewType: string = "model_components",
-  ) {
+    viewType = "model_components",
+  ): void {
     const viewId = `${id}_${viewType}`;
-    const index = opened_views.value.findIndex((view) => view.id === viewId);
+    const index = opened_views.value.findIndex((view: ReadonlyOpenedView) => view.id === viewId);
     if (index !== -1) {
-      return closeView(viewId);
+      closeView(viewId);
+      return;
     }
     additionalPanelWidth.value = panelWidth.value;
     opened_views.value.push({
@@ -212,7 +234,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
       id: viewId,
       modelId: id,
       viewType,
-      title: title || id,
+      title: title ?? id,
       geode_object_type: geodeObjectType,
       scrollTop: 0,
       opened: [],
@@ -228,17 +250,19 @@ export const useTreeviewStore = defineStore("treeview", () => {
     }
   }
 
-  function importStores(snapshot: TreeviewSnapshot | undefined): void {
-    opened_views.value = snapshot?.opened_views || defaultOpenedViews();
-    panelWidth.value = snapshot?.panelWidth || PANEL_WIDTH;
-    additionalPanelWidth.value = snapshot?.additionalPanelWidth || PANEL_WIDTH;
-    rowHeights.value = snapshot?.rowHeights || [];
-    pendingSelectionIds.value =
-      snapshot?.selectionIds ||
-      (snapshot?.selection || []).map((selectionItem) =>
-        typeof selectionItem === "string" ? selectionItem : selectionItem.id,
-      ) ||
-      [];
+  function importStores(snapshot: ReadonlyTreeviewSnapshot | undefined): void {
+    opened_views.value = snapshot?.opened_views
+      ? // oxlint-disable-next-line no-unsafe-type-assertion -- narrowing the readonly parameter view back to the mutable working type; these objects aren't actually frozen at runtime.
+        ([...snapshot.opened_views] as OpenedView[])
+      : defaultOpenedViews();
+    panelWidth.value = snapshot?.panelWidth ?? PANEL_WIDTH;
+    additionalPanelWidth.value = snapshot?.additionalPanelWidth ?? PANEL_WIDTH;
+    rowHeights.value = snapshot?.rowHeights ? [...snapshot.rowHeights] : [];
+    pendingSelectionIds.value = snapshot?.selectionIds
+      ? [...snapshot.selectionIds]
+      : (snapshot?.selection ?? []).map((selectionItem: Readonly<string | { id: string }>) =>
+          typeof selectionItem === "string" ? selectionItem : selectionItem.id,
+        );
   }
 
   function finalizeImportSelection(): void {
@@ -278,24 +302,28 @@ export const useTreeviewStore = defineStore("treeview", () => {
   }
 
   function setScrollTop(viewId: string, scrollTop: number): void {
-    const view = opened_views.value.find((openedView) => openedView.id === viewId);
+    const view = opened_views.value.find(
+      (openedView: ReadonlyOpenedView) => openedView.id === viewId,
+    );
     if (view) {
       view.scrollTop = scrollTop;
     }
   }
 
-  function setOpened(viewId: string, opened: string[]): void {
-    const view = opened_views.value.find((openedView) => openedView.id === viewId);
+  function setOpened(viewId: string, opened: readonly string[]): void {
+    const view = opened_views.value.find(
+      (openedView: ReadonlyOpenedView) => openedView.id === viewId,
+    );
     if (view) {
-      view.opened = opened;
+      view.opened = [...opened];
     }
   }
 
-  function setRowHeights(heights: number[]): void {
-    rowHeights.value = heights;
+  function setRowHeights(heights: readonly number[]): void {
+    rowHeights.value = [...heights];
   }
 
-  function exportStores() {
+  function exportStores(): Omit<TreeviewConfigRecord, "id"> {
     return {
       opened_views: opened_views.value,
       panelWidth: panelWidth.value,
@@ -317,7 +345,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
         break;
       }
     }
-    const view = opened_views.value.find((openedView) => openedView.id === id);
+    const view = opened_views.value.find((openedView: ReadonlyOpenedView) => openedView.id === id);
     if (view) {
       view.title = newName;
     }
@@ -351,3 +379,5 @@ export const useTreeviewStore = defineStore("treeview", () => {
     clear,
   };
 });
+
+export type { TreeviewSnapshot };
diff --git a/app/stores/viewer.ts b/app/stores/viewer.ts
index a898df6f..51dcbf73 100644
--- a/app/stores/viewer.ts
+++ b/app/stores/viewer.ts
@@ -18,6 +18,7 @@ import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
 
 import type { JsonRpcSchema, RequestHandlers } from "@ogw_shared/utils/types.js";
+// oxlint-disable-next-line import/max-dependencies -- all imports above are required by this store.
 import type { RpcClient } from "@ogw_shared/utils/call_raw.js";
 
 interface PickedPoint {
@@ -35,6 +36,7 @@ export const useViewerStore = defineStore(
   () => {
     const infraStore = useInfraStore();
     const default_local_port = ref("1234");
+    // oxlint-disable-next-line no-unsafe-type-assertion -- placeholder before the real client is set by ws_connect.
     const client = ref<RpcClient>({} as RpcClient);
     const config = ref<unknown>(undefined);
     const picking_mode = ref(false);
@@ -60,16 +62,20 @@ export const useViewerStore = defineStore(
     function toggle_picking_mode(value: boolean): void {
       picking_mode.value = value;
     }
-    function request(
+    async function request(
       {
         schema,
         params = {},
         timeout = request_timeout,
-      }: { schema: JsonRpcSchema; params?: Record<string, unknown>; timeout?: number },
+      }: Readonly<{
+        schema: JsonRpcSchema;
+        params?: Readonly<Record<string, unknown>>;
+        timeout?: number;
+      }>,
       callbacks: RequestHandlers = {},
     ): Promise<unknown> {
       const store = useViewerStore();
-      return viewer_call(
+      const result = await viewer_call(
         store,
         {
           schema,
@@ -85,6 +91,7 @@ export const useViewerStore = defineStore(
           },
         },
       );
+      return result;
     }
     async function set_picked_point(x: number, y: number): Promise<void> {
       const schema = opengeodeweb_viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
@@ -100,6 +107,7 @@ export const useViewerStore = defineStore(
         x: world_x,
         y: world_y,
         z: world_z,
+        // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the get_point_position schema.
       } = response as { x: number; y: number; z: number };
       picked_point.value = {
         x: world_x,
@@ -107,23 +115,24 @@ export const useViewerStore = defineStore(
         z: world_z,
       };
     }
-    function ws_connect() {
+    async function ws_connect(): Promise<void> {
       if (status.value === Status.CONNECTED) {
-        return undefined;
+        return;
       }
-      return navigator.locks.request("viewer.ws_connect", async (lock) => {
+      await navigator.locks.request("viewer.ws_connect", async () => {
         if (status.value === Status.CONNECTED) {
           return;
         }
         try {
-          console.log("VIEWER LOCK GRANTED !", lock);
           status.value = Status.CONNECTING;
           client.value = (await initWebSocketClient(base_url.value, client.value, {
             onConnectionClose: () => {
               status.value = Status.NOT_CONNECTED;
             },
+            // oxlint-disable-next-line no-unsafe-type-assertion -- initWebSocketClient's return is not typed as RpcClient.
           })) as unknown as RpcClient;
           connectImageStream(client.value.getConnection().getSession());
+          // oxlint-disable-next-line no-unsafe-type-assertion -- endBusy is not part of the RpcClient type.
           (client.value as unknown as { endBusy: () => void }).endBusy();
           const schema = opengeodeweb_viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization;
           const timeout = undefined;
@@ -133,7 +142,6 @@ export const useViewerStore = defineStore(
           });
           status.value = Status.CONNECTED;
         } catch (error) {
-          console.error("ws_connect error", error);
           status.value = Status.NOT_CONNECTED;
           throw error;
         }
@@ -145,10 +153,7 @@ export const useViewerStore = defineStore(
     function stop_request(): void {
       request_counter.value -= 1;
     }
-    function launch(args: { projectFolderPath?: string } = {}) {
-      console.log("[VIEWER] Launching viewer microservice...", {
-        args,
-      });
+    async function launch(args: Readonly<{ projectFolderPath?: string }> = {}): Promise<unknown> {
       const appStore = useAppStore();
       const { COMMAND_VIEWER, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = opengeodeweb_front_schemas.api.local.app.run_viewer;
@@ -157,41 +162,41 @@ export const useViewerStore = defineStore(
         NUXT_ROOT_PATH,
         args,
       };
-      console.log("[VIEWER] params", params);
-      return appStore.request(
+      const result = await appStore.request(
         {
           schema,
           params,
         },
         {
           response_function: (response: unknown) => {
+            // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the run_viewer schema.
             const { port: viewerPort } = response as { port: string };
-            console.log(`[VIEWER] Viewer launched on port ${viewerPort}`);
             default_local_port.value = viewerPort;
           },
         },
       );
+      return result;
     }
     async function connect(): Promise<void> {
-      console.log("[VIEWER] Connecting to viewer microservice...");
       await ws_connect();
-      console.log("[VIEWER] Viewer connected successfully");
     }
-    function get_version(schema: JsonRpcSchema | undefined) {
+    async function get_version(schema: JsonRpcSchema | undefined): Promise<unknown> {
       if (!schema) {
         return undefined;
       }
-      return request(
+      const result = await request(
         {
           schema,
         },
         {
           response_function: (response: unknown) => {
+            // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the version schema.
             const { microservice_version } = response as { microservice_version: string };
             version.value = microservice_version;
           },
         },
       );
+      return result;
     }
     return {
       default_local_port,
diff --git a/app/utils/attributes.ts b/app/utils/attributes.ts
index 3a73490c..448efa28 100644
--- a/app/utils/attributes.ts
+++ b/app/utils/attributes.ts
@@ -1,6 +1,6 @@
 interface AttributeRangeSource {
-  min_values?: number[];
-  max_values?: number[];
+  min_values?: readonly number[];
+  max_values?: readonly number[];
   min_value?: number;
   max_value?: number;
 }
@@ -11,8 +11,8 @@ interface AttributeRange {
 }
 
 export function getAttributeRange(
-  currentAttribute: AttributeRangeSource | undefined | null,
-  compIndex: number = 0,
+  currentAttribute: Readonly<AttributeRangeSource> | undefined | null,
+  compIndex = 0,
 ): AttributeRange {
   if (!currentAttribute) {
     return { min: 0, max: 1 };
diff --git a/app/utils/clipping_planes.ts b/app/utils/clipping_planes.ts
index 8634a788..8d3e8921 100644
--- a/app/utils/clipping_planes.ts
+++ b/app/utils/clipping_planes.ts
@@ -1,5 +1,6 @@
 import type { Bounds } from "@kitware/vtk.js/types";
 import type vtkActor from "@kitware/vtk.js/Rendering/Core/Actor";
+import type { vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
 
 const AXIS_SCALE = 0.45;
 const SIZE_RATIO = 0.1;
@@ -20,16 +21,15 @@ const DEFAULT_NORMALS = [NORMAL_X, NORMAL_Y, NORMAL_Z];
 const RGB_MAX_VALUE = 255;
 
 function getPlaneCssColor(index: number): string {
-  // Modulo guarantees this index is within bounds of the non-empty PLANE_COLORS array.
-  const rgb = PLANE_COLORS[index % PLANE_COLORS.length]!;
+  const rgb = PLANE_COLORS[index % PLANE_COLORS.length] ?? COLOR_BLUE;
   return `rgb(${rgb.map((channel) => Math.round(channel * RGB_MAX_VALUE)).join(",")})`;
 }
 
 function hasPlaneChanged(
-  origin: number[],
-  normal: number[],
-  currentOrigin: number[] | undefined,
-  currentNormal: number[] | undefined,
+  origin: readonly number[],
+  normal: readonly number[],
+  currentOrigin: readonly number[] | undefined,
+  currentNormal: readonly number[] | undefined,
 ): boolean {
   if (!currentOrigin) {
     return true;
@@ -40,7 +40,27 @@ function hasPlaneChanged(
   );
 }
 
-function getPlaneStyle(rgb: number[]) {
+interface PlaneVisualState {
+  readonly plane: { readonly opacity: number; readonly color: readonly number[] };
+  readonly normal: { readonly opacity: number; readonly color: readonly number[] };
+  readonly origin: { readonly opacity: number; readonly color: readonly number[] };
+}
+
+interface PlaneStyle {
+  readonly active: PlaneVisualState;
+  readonly inactive: PlaneVisualState;
+  readonly static: {
+    readonly display2D: { readonly representation: number };
+    readonly outline: {
+      readonly color: readonly number[];
+      readonly opacity: number;
+      readonly representation: number;
+      readonly interpolation: number;
+    };
+  };
+}
+
+function getPlaneStyle(rgb: readonly number[]): PlaneStyle {
   return {
     active: {
       plane: { opacity: 1, color: rgb },
@@ -59,7 +79,7 @@ function getPlaneStyle(rgb: number[]) {
   };
 }
 
-function computeSceneBounds(actors: vtkActor[]): Bounds {
+function computeSceneBounds(actors: readonly Readonly<vtkActor>[]): Bounds {
   let bounds: Bounds = [Infinity, -Infinity, Infinity, -Infinity, Infinity, -Infinity];
   for (const actor of actors) {
     const boundsOfActor = actor.getBounds();
@@ -76,12 +96,12 @@ function computeSceneBounds(actors: vtkActor[]): Bounds {
 }
 
 interface SceneBoundsInfo {
-  center: number[];
-  cubicBounds: number[];
+  readonly center: readonly number[];
+  readonly cubicBounds: readonly number[];
 }
 
-function computeSceneBoundsInfo(actors: vtkActor[]): SceneBoundsInfo {
-  if (!actors || actors.length === 0) {
+function computeSceneBoundsInfo(actors: readonly Readonly<vtkActor>[]): SceneBoundsInfo {
+  if (actors.length === 0) {
     return { center: [0, 0, 0], cubicBounds: [-1, 1, -1, 1, -1, 1] };
   }
   const [xmin, xmax, ymin, ymax, zmin, zmax] = computeSceneBounds(actors);
@@ -92,13 +112,13 @@ function computeSceneBoundsInfo(actors: vtkActor[]): SceneBoundsInfo {
   ];
 
   const maxActorExtent = Math.max(
-    ...actors.map((actor) => {
+    ...actors.map((actor: Readonly<vtkActor>) => {
       const bounds = actor.getBounds();
       return Math.max(bounds[1] - bounds[0], bounds[3] - bounds[2], bounds[5] - bounds[4]);
     }),
   );
   const halfExtent = maxActorExtent / 2;
-  const [centerX, centerY, centerZ] = center as [number, number, number];
+  const [centerX = 0, centerY = 0, centerZ = 0] = center;
   const cubicBounds = [
     centerX - halfExtent,
     centerX + halfExtent,
@@ -110,6 +130,84 @@ function computeSceneBoundsInfo(actors: vtkActor[]): SceneBoundsInfo {
   return { center, cubicBounds };
 }
 
+interface ActorEntry {
+  readonly actor: Readonly<vtkActor>;
+}
+
+interface MainCameraOptions {
+  readonly focal_point?: readonly number[];
+  readonly position?: readonly number[];
+  readonly view_up?: readonly number[];
+}
+
+function resolveActiveActors(
+  targetAllVisible: boolean,
+  allItems: readonly { readonly id: string }[],
+  selectedDatasetIds: readonly string[],
+  hybridDb: Readonly<Record<string, ActorEntry | undefined>>,
+): Readonly<vtkActor>[] {
+  const targetIds = targetAllVisible
+    ? allItems.map((item: Readonly<{ id: string }>) => item.id)
+    : selectedDatasetIds;
+  const targeted = targetIds
+    .map((id) => hybridDb[id]?.actor)
+    .filter(
+      (actor: Readonly<vtkActor> | undefined): actor is Readonly<vtkActor> => actor !== undefined,
+    );
+  if (targeted.length > 0) {
+    return targeted;
+  }
+  return Object.values(hybridDb)
+    .filter(
+      (entry: Readonly<ActorEntry> | undefined): entry is Readonly<ActorEntry> =>
+        entry !== undefined,
+    )
+    .map((entry: Readonly<ActorEntry>) => entry.actor);
+}
+
+function computeNormalizedViewDirection(
+  focalPoint: readonly number[],
+  position: readonly number[],
+): readonly number[] | undefined {
+  const dir = [
+    (position[0] ?? 0) - (focalPoint[0] ?? 0),
+    (position[1] ?? 0) - (focalPoint[1] ?? 0),
+    (position[2] ?? 0) - (focalPoint[2] ?? 0),
+  ];
+  const dirLen = Math.hypot(...dir);
+  if (dirLen === 0) {
+    return undefined;
+  }
+  return dir.map((component) => component / dirLen);
+}
+
+// Aligns the local clipping-plane preview camera onto the same viewing direction as the
+// Main viewer camera, re-centered on the clipped scene's bounds.
+function alignCameraToMainCamera(
+  camera: Readonly<vtkCamera>,
+  mainCam: Readonly<MainCameraOptions>,
+  center: readonly number[],
+): void {
+  if (!mainCam.focal_point || !mainCam.position) {
+    return;
+  }
+  const normDir = computeNormalizedViewDirection(mainCam.focal_point, mainCam.position);
+  if (!normDir) {
+    return;
+  }
+  const distance = camera.getDistance();
+  camera.setFocalPoint(center[0] ?? 0, center[1] ?? 0, center[2] ?? 0);
+  camera.setPosition(
+    (center[0] ?? 0) + (normDir[0] ?? 0) * distance,
+    (center[1] ?? 0) + (normDir[1] ?? 0) * distance,
+    (center[2] ?? 0) + (normDir[2] ?? 0) * distance,
+  );
+  if (mainCam.view_up) {
+    const [viewUpX = 0, viewUpY = 0, viewUpZ = 0] = mainCam.view_up;
+    camera.setViewUp(viewUpX, viewUpY, viewUpZ);
+  }
+}
+
 export {
   AXIS_SCALE,
   SIZE_RATIO,
@@ -122,4 +220,8 @@ export {
   getPlaneStyle,
   computeSceneBounds,
   computeSceneBoundsInfo,
+  resolveActiveActors,
+  alignCameraToMainCamera,
 };
+
+export type { SceneBoundsInfo, MainCameraOptions };
diff --git a/app/utils/colormap.ts b/app/utils/colormap.ts
index 2ca74498..53869454 100644
--- a/app/utils/colormap.ts
+++ b/app/utils/colormap.ts
@@ -3,46 +3,43 @@ import colormaps from "@ogw_front/assets/colormaps.json";
 
 import { newInstance as vtkColorTransferFunction } from "@kitware/vtk.js/Rendering/Core/ColorTransferFunction";
 
-type ColormapPreset = (typeof colormaps)[number]["Children"][number];
+interface ColormapPreset {
+  readonly Name: string;
+  readonly RGBPoints: readonly number[];
+}
+
+interface ColormapCategory {
+  readonly Name: string;
+  readonly Children: readonly ColormapPreset[];
+}
+
+const typedColormaps = colormaps as readonly ColormapCategory[];
 
 function getPresetByName(presetName: string): ColormapPreset | undefined {
-  return colormaps
-    .flatMap((category) => category.Children)
-    .find((preset) => preset.Name === presetName);
+  return typedColormaps
+    .flatMap((category: ColormapCategory) => category.Children)
+    .find((preset: ColormapPreset) => preset.Name === presetName);
 }
 
-function getRGBPointsFromPreset(presetName: string): number[] {
+function getRGBPointsFromPreset(presetName: string): readonly number[] {
   return getPresetByName(presetName)?.RGBPoints ?? [];
 }
 
-function getPresetsWithCurrentAtTop(presetName: string) {
+function getPresetsWithCurrentAtTop(
+  presetName: string,
+): readonly (ColormapPreset | ColormapCategory)[] {
   const currentPreset = getPresetByName(presetName);
-  return [currentPreset, ...colormaps].filter((preset): preset is NonNullable<typeof preset> =>
-    Boolean(preset),
+  return [currentPreset, ...typedColormaps].filter(
+    (preset: ColormapPreset | ColormapCategory | undefined): preset is NonNullable<typeof preset> =>
+      Boolean(preset),
   );
 }
 
-function drawCanvasForPreset(
-  presetName: string,
-  canvas: HTMLCanvasElement | undefined | null,
-): void {
-  if (!canvas) {
-    return;
-  }
-  const rgbPoints = getRGBPointsFromPreset(presetName);
-  if (!rgbPoints || rgbPoints.length === 0) {
-    return;
-  }
-  const ctx = canvas.getContext("2d");
-  if (!ctx) {
-    return;
-  }
-  const { height, width } = canvas;
-  const lut = vtkColorTransferFunction();
-
-  const LAST_POINT_OFFSET = 4;
-  const THREE = 3;
+const LAST_POINT_OFFSET = 4;
+const THREE = 3;
 
+function buildColorTable(rgbPoints: readonly number[], width: number): Float32Array {
+  const lut = vtkColorTransferFunction();
   for (let pointIdx = 0; pointIdx < rgbPoints.length; pointIdx += 4) {
     lut.addRGBPoint(
       rgbPoints[pointIdx] ?? 0,
@@ -51,13 +48,17 @@ function drawCanvasForPreset(
       rgbPoints[pointIdx + THREE] ?? 0,
     );
   }
-  const table = lut.getUint8Table(
-    rgbPoints[0] ?? 0,
-    rgbPoints.at(-LAST_POINT_OFFSET) ?? 0,
-    width,
-    true,
-  );
-  const imageData = ctx.createImageData(width, height);
+  return lut.getUint8Table(rgbPoints[0] ?? 0, rgbPoints.at(-LAST_POINT_OFFSET) ?? 0, width, true);
+}
+
+function fillImageDataFromTable(
+  // ImageData can't satisfy prefer-readonly-parameter-types since lib.dom.d.ts types are inherently mutable, so this finding is left unfixed (same pattern as app/plugins/auto_store_register.ts).
+  imageData: ImageData,
+  // Float32Array's numeric index signature is inherently mutable and can't satisfy prefer-readonly-parameter-types, so this finding is left unfixed (same pattern as app/plugins/auto_store_register.ts).
+  table: Readonly<Float32Array>,
+  width: number,
+  height: number,
+): void {
   for (let xCoord = 0; xCoord < width; xCoord += 1) {
     const alpha = table[xCoord * 4 + THREE] ?? 0;
     const blue = table[xCoord * 4 + 2] ?? 0;
@@ -71,6 +72,28 @@ function drawCanvasForPreset(
       imageData.data[pixelIdx + THREE] = alpha;
     }
   }
+}
+
+function drawCanvasForPreset(
+  presetName: string,
+  // HTMLCanvasElement can't satisfy prefer-readonly-parameter-types since lib.dom.d.ts types are inherently mutable, so this finding is left unfixed (same pattern as app/plugins/auto_store_register.ts).
+  canvas: HTMLCanvasElement | undefined | null,
+): void {
+  if (!canvas) {
+    return;
+  }
+  const rgbPoints = getRGBPointsFromPreset(presetName);
+  if (rgbPoints.length === 0) {
+    return;
+  }
+  const ctx = canvas.getContext("2d");
+  if (!ctx) {
+    return;
+  }
+  const { height, width } = canvas;
+  const table = buildColorTable(rgbPoints, width);
+  const imageData = ctx.createImageData(width, height);
+  fillImageDataFromTable(imageData, table, width, height);
   ctx.putImageData(imageData, 0, 0);
 }
 
diff --git a/app/utils/default_styles/index.ts b/app/utils/default_styles/index.ts
index a4012f98..86247915 100644
--- a/app/utils/default_styles/index.ts
+++ b/app/utils/default_styles/index.ts
@@ -15,7 +15,7 @@ import {
   surfaceDefaultStyle,
 } from "./meshes";
 
-function default_styles() {
+function default_styles(): Record<string, unknown> {
   return {
     BRep: brepDefaultStyle(),
     CrossSection: crossSectionDefaultStyle(),
@@ -45,7 +45,7 @@ function default_styles() {
   };
 }
 
-function getDefaultStyle(type: string) {
+function getDefaultStyle(type: string): unknown {
   const styles: Record<string, unknown> = default_styles();
   return styles[type];
 }
diff --git a/app/utils/default_styles/meshes.ts b/app/utils/default_styles/meshes.ts
index 1cb3b4a9..6fd6efd0 100644
--- a/app/utils/default_styles/meshes.ts
+++ b/app/utils/default_styles/meshes.ts
@@ -1,4 +1,5 @@
 import {
+  type AttributeConfig,
   CELLS_DEFAULT_COLOR,
   CELLS_DEFAULT_VISIBILITY,
   EDGES_DEFAULT_COLOR,
@@ -12,19 +13,112 @@ import {
   POLYGONS_DEFAULT_VISIBILITY,
   POLYHEDRA_DEFAULT_COLOR,
   POLYHEDRA_DEFAULT_VISIBILITY,
+  type RGBAColor,
 } from "./constants";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { AttributeConfig, RGBAColor } from "./constants";
 
 function emptyAttributeConfig(): AttributeConfig {
   return { name: undefined, storedConfigs: {} };
 }
 
+interface MeshComponentColoring {
+  active: string;
+  constant: RGBAColor;
+  vertex: AttributeConfig;
+}
+
+interface MeshEdgesColoring extends MeshComponentColoring {
+  edge: AttributeConfig;
+}
+
+interface MeshCellsColoring extends MeshComponentColoring {
+  cell: AttributeConfig;
+  // oxlint-disable-next-line unicorn/no-null
+  textures: null;
+}
+
+interface MeshPolygonsColoring extends MeshComponentColoring {
+  // oxlint-disable-next-line unicorn/no-null
+  textures: null;
+  polygon: AttributeConfig;
+}
+
+interface MeshPolyhedraColoring extends MeshComponentColoring {
+  polyhedron: AttributeConfig;
+}
+
+interface MeshPointsStyle {
+  visibility: boolean;
+  coloring: MeshComponentColoring;
+  size: number;
+}
+
+interface MeshEdgesStyle {
+  visibility: boolean;
+  coloring: MeshEdgesColoring;
+  width: number;
+}
+
+interface MeshCellsStyle {
+  visibility: boolean;
+  coloring: MeshCellsColoring;
+}
+
+interface MeshPolygonsStyle {
+  visibility: boolean;
+  coloring: MeshPolygonsColoring;
+}
+
+interface MeshPolyhedraStyle {
+  visibility: boolean;
+  coloring: MeshPolyhedraColoring;
+}
+
+interface PointSetStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+}
+
+interface EdgedCurveStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+  edges: MeshEdgesStyle;
+}
+
+interface Grid2dStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+  edges: MeshEdgesStyle;
+  cells: MeshCellsStyle;
+}
+
+interface Grid3dStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+  edges: MeshEdgesStyle;
+  cells: MeshCellsStyle;
+  polyhedra: MeshPolyhedraStyle;
+}
+
+interface SurfaceStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+  edges: MeshEdgesStyle;
+  polygons: MeshPolygonsStyle;
+}
+
+interface SolidStyle {
+  visibility: boolean;
+  points: MeshPointsStyle;
+  edges: MeshEdgesStyle;
+  polygons: MeshPolygonsStyle;
+  polyhedra: MeshPolyhedraStyle;
+}
+
 function meshPointsDefaultStyle(
   visibility: boolean = POINTS_DEFAULT_VISIBILITY,
   size: number = POINTS_DEFAULT_SIZE,
-  constant: RGBAColor = POINTS_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = POINTS_DEFAULT_COLOR,
+): MeshPointsStyle {
   return {
     visibility,
     coloring: {
@@ -39,8 +133,8 @@ function meshPointsDefaultStyle(
 function meshEdgesDefaultStyle(
   visibility: boolean = EDGES_DEFAULT_VISIBILITY,
   width: number = EDGES_DEFAULT_WIDTH,
-  constant: RGBAColor = EDGES_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = EDGES_DEFAULT_COLOR,
+): MeshEdgesStyle {
   return {
     visibility,
     coloring: {
@@ -55,8 +149,8 @@ function meshEdgesDefaultStyle(
 
 function meshCellsDefaultStyle(
   visibility: boolean = CELLS_DEFAULT_VISIBILITY,
-  constant: RGBAColor = CELLS_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = CELLS_DEFAULT_COLOR,
+): MeshCellsStyle {
   return {
     visibility,
     coloring: {
@@ -72,8 +166,8 @@ function meshCellsDefaultStyle(
 
 function meshPolygonsDefaultStyle(
   visibility: boolean = POLYGONS_DEFAULT_VISIBILITY,
-  constant: RGBAColor = POLYGONS_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = POLYGONS_DEFAULT_COLOR,
+): MeshPolygonsStyle {
   return {
     visibility,
     coloring: {
@@ -89,8 +183,8 @@ function meshPolygonsDefaultStyle(
 
 function meshPolyhedraDefaultStyle(
   visibility: boolean = POLYHEDRA_DEFAULT_VISIBILITY,
-  constant: RGBAColor = POLYHEDRA_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = POLYHEDRA_DEFAULT_COLOR,
+): MeshPolyhedraStyle {
   return {
     visibility,
     coloring: {
@@ -102,14 +196,14 @@ function meshPolyhedraDefaultStyle(
   };
 }
 
-function pointSetDefaultStyle() {
+function pointSetDefaultStyle(): PointSetStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
   };
 }
 
-function edgedCurveDefaultStyle() {
+function edgedCurveDefaultStyle(): EdgedCurveStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
@@ -117,7 +211,7 @@ function edgedCurveDefaultStyle() {
   };
 }
 
-function grid2dDefaultStyle() {
+function grid2dDefaultStyle(): Grid2dStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -126,7 +220,7 @@ function grid2dDefaultStyle() {
   };
 }
 
-function grid3dDefaultStyle() {
+function grid3dDefaultStyle(): Grid3dStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -136,7 +230,7 @@ function grid3dDefaultStyle() {
   };
 }
 
-function surfaceDefaultStyle() {
+function surfaceDefaultStyle(): SurfaceStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -145,7 +239,7 @@ function surfaceDefaultStyle() {
   };
 }
 
-function solidDefaultStyle() {
+function solidDefaultStyle(): SolidStyle {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
diff --git a/app/utils/default_styles/models.ts b/app/utils/default_styles/models.ts
index 06d0dea3..4b35e754 100644
--- a/app/utils/default_styles/models.ts
+++ b/app/utils/default_styles/models.ts
@@ -1,4 +1,5 @@
 import {
+  type AttributeConfig,
   BLOCKS_DEFAULT_ACTIVE_COLORING,
   BLOCKS_DEFAULT_COLOR,
   BLOCKS_DEFAULT_VISIBILITY,
@@ -14,21 +15,89 @@ import {
   MODEL_DEFAULT_COLOR,
   POINTS_DEFAULT_SIZE,
   POINTS_DEFAULT_VISIBILITY,
+  type RGBAColor,
   SURFACES_DEFAULT_ACTIVE_COLORING,
   SURFACES_DEFAULT_COLOR,
   SURFACES_DEFAULT_VISIBILITY,
 } from "./constants";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { AttributeConfig, RGBAColor } from "./constants";
 
 function emptyAttributeConfig(): AttributeConfig {
   return { name: undefined, storedConfigs: {} };
 }
 
+interface ModelComponentColoring {
+  active: string;
+  constant: RGBAColor;
+  vertex: AttributeConfig;
+}
+
+interface ModelLinesColoring extends ModelComponentColoring {
+  edge: AttributeConfig;
+}
+
+interface ModelSurfacesColoring extends ModelComponentColoring {
+  polygon: AttributeConfig;
+}
+
+interface ModelBlocksColoring extends ModelComponentColoring {
+  polyhedron: AttributeConfig;
+}
+
+interface ModelCornersStyle {
+  visibility: boolean;
+  coloring: ModelComponentColoring;
+}
+
+interface ModelLinesStyle {
+  visibility: boolean;
+  coloring: ModelLinesColoring;
+}
+
+interface ModelSurfacesStyle {
+  visibility: boolean;
+  coloring: ModelSurfacesColoring;
+}
+
+interface ModelBlocksStyle {
+  visibility: boolean;
+  coloring: ModelBlocksColoring;
+}
+
+interface ModelPointsStyle {
+  visibility: boolean;
+  size: number;
+}
+
+interface ModelEdgesStyle {
+  visibility: boolean;
+  width: number;
+}
+
+interface ModelWithBlocksStyle {
+  visibility: boolean;
+  coloring: { active: string; constant: RGBAColor };
+  corners: ModelCornersStyle;
+  lines: ModelLinesStyle;
+  surfaces: ModelSurfacesStyle;
+  blocks: ModelBlocksStyle;
+  points: ModelPointsStyle;
+  edges: ModelEdgesStyle;
+}
+
+interface ModelWithoutBlocksStyle {
+  visibility: boolean;
+  coloring: { active: string; constant: RGBAColor };
+  corners: ModelCornersStyle;
+  lines: ModelLinesStyle;
+  surfaces: ModelSurfacesStyle;
+  points: ModelPointsStyle;
+  edges: ModelEdgesStyle;
+}
+
 function modelCornersDefaultStyle(
   visibility: boolean = CORNERS_DEFAULT_VISIBILITY,
-  constant: RGBAColor = CORNERS_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = CORNERS_DEFAULT_COLOR,
+): ModelCornersStyle {
   return {
     visibility,
     coloring: {
@@ -41,8 +110,8 @@ function modelCornersDefaultStyle(
 
 function modelLinesDefaultStyle(
   visibility: boolean = LINES_DEFAULT_VISIBILITY,
-  constant: RGBAColor = LINES_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = LINES_DEFAULT_COLOR,
+): ModelLinesStyle {
   return {
     visibility,
     coloring: {
@@ -56,8 +125,8 @@ function modelLinesDefaultStyle(
 
 function modelSurfacesDefaultStyle(
   visibility: boolean = SURFACES_DEFAULT_VISIBILITY,
-  constant: RGBAColor = SURFACES_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = SURFACES_DEFAULT_COLOR,
+): ModelSurfacesStyle {
   return {
     visibility,
     coloring: {
@@ -71,8 +140,8 @@ function modelSurfacesDefaultStyle(
 
 function modelBlocksDefaultStyle(
   visibility: boolean = BLOCKS_DEFAULT_VISIBILITY,
-  constant: RGBAColor = BLOCKS_DEFAULT_COLOR,
-) {
+  constant: Readonly<RGBAColor> = BLOCKS_DEFAULT_COLOR,
+): ModelBlocksStyle {
   return {
     visibility,
     coloring: {
@@ -87,14 +156,14 @@ function modelBlocksDefaultStyle(
 function modelPointsDefaultStyle(
   visibility: boolean = POINTS_DEFAULT_VISIBILITY,
   size: number = POINTS_DEFAULT_SIZE,
-) {
+): ModelPointsStyle {
   return { visibility, size };
 }
 
 function modelEdgesDefaultStyle(
   visibility: boolean = EDGES_DEFAULT_VISIBILITY,
   width: number = EDGES_DEFAULT_WIDTH,
-) {
+): ModelEdgesStyle {
   return { visibility, width };
 }
 
@@ -105,7 +174,7 @@ const DEFAULT_MODEL_COMPONENT_TYPE_STYLES = {
   Block: modelBlocksDefaultStyle(),
 };
 
-function brepDefaultStyle() {
+function brepDefaultStyle(): ModelWithBlocksStyle {
   return {
     visibility: true,
     coloring: {
@@ -121,7 +190,7 @@ function brepDefaultStyle() {
   };
 }
 
-function crossSectionDefaultStyle() {
+function crossSectionDefaultStyle(): ModelWithoutBlocksStyle {
   return {
     visibility: true,
     coloring: {
@@ -136,7 +205,7 @@ function crossSectionDefaultStyle() {
   };
 }
 
-function structuralModelDefaultStyle() {
+function structuralModelDefaultStyle(): ModelWithBlocksStyle {
   return {
     visibility: true,
     coloring: {
@@ -152,7 +221,7 @@ function structuralModelDefaultStyle() {
   };
 }
 
-function sectionDefaultStyle() {
+function sectionDefaultStyle(): ModelWithoutBlocksStyle {
   return {
     visibility: true,
     coloring: {
@@ -167,7 +236,7 @@ function sectionDefaultStyle() {
   };
 }
 
-function implicitCrossSectionDefaultStyle() {
+function implicitCrossSectionDefaultStyle(): ModelWithoutBlocksStyle {
   return {
     visibility: true,
     coloring: {
@@ -182,7 +251,7 @@ function implicitCrossSectionDefaultStyle() {
   };
 }
 
-function implicitStructuralModelDefaultStyle() {
+function implicitStructuralModelDefaultStyle(): ModelWithBlocksStyle {
   return {
     visibility: true,
     coloring: {
diff --git a/app/utils/extension.ts b/app/utils/extension.ts
index 93254b11..6b2d847a 100644
--- a/app/utils/extension.ts
+++ b/app/utils/extension.ts
@@ -3,12 +3,10 @@
 // Third party imports
 
 // Local imports
+import type { RegisterableStore, useAppStore } from "@ogw_front/stores/app";
+import type { Microservice } from "@ogw_front/stores/infra";
 import { isCloudMode } from "@ogw_front/utils/stores";
 import opengeodeweb_front_schemas from "@geode/opengeodeweb-front/opengeodeweb_front_schemas.json" with { type: "json" };
-import { useAppStore } from "@ogw_front/stores/app";
-import { useInfraStore } from "@ogw_front/stores/infra";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Microservice } from "@ogw_front/stores/infra";
 
 interface ExtensionDescriptor {
   id: string;
@@ -23,12 +21,22 @@ interface DownloadExtensionParams {
   extensionFileName: string;
 }
 
-async function uploadExtension(file: File): Promise<void> {
+type AppStoreInstance = ReturnType<typeof useAppStore>;
+type ExtensionModuleType = Awaited<ReturnType<AppStoreInstance["loadExtension"]>>;
+interface RegisteredExtension {
+  name: string;
+  version: string;
+  extensionModule: ExtensionModuleType;
+}
+
+async function uploadExtension(file: Readonly<File>): Promise<void> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
   const appStore = useAppStore();
   await appStore.upload(file);
 }
 
-function runExtensions() {
+async function runExtensions(): Promise<{ extensionsArray: ExtensionDescriptor[] }> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
   const appStore = useAppStore();
   const { projectFolderPath } = appStore;
   const { PROJECT: projectName } = useRuntimeConfig().public;
@@ -39,13 +47,18 @@ function runExtensions() {
     projectFolderPath,
     projectName,
   };
-  return appStore.request({
+  const result = await appStore.request<{ extensionsArray: ExtensionDescriptor[] }>({
     schema,
     params,
-  }) as Promise<{ extensionsArray: ExtensionDescriptor[] }>;
+  });
+  return result;
 }
 
-function downloadExtension({ url, extensionFileName }: DownloadExtensionParams) {
+async function downloadExtension({
+  url,
+  extensionFileName,
+}: Readonly<DownloadExtensionParams>): Promise<unknown> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
   const appStore = useAppStore();
   const { PROJECT: projectName } = useRuntimeConfig().public;
   const schema = opengeodeweb_front_schemas.api.microservice.extensions.download;
@@ -54,18 +67,27 @@ function downloadExtension({ url, extensionFileName }: DownloadExtensionParams)
     url,
     extensionFileName,
   };
-  return appStore.request({
+  const result = await appStore.request({
     schema,
     params,
   });
+  return result;
+}
+
+function isMicroservice(
+  store: Readonly<RegisterableStore>,
+): store is RegisterableStore & Microservice {
+  return typeof store.connect === "function";
 }
 
-async function registerRunningExtensions() {
+async function registerRunningExtensions(): Promise<RegisteredExtension[]> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
+  const { useInfraStore } = await import("@ogw_front/stores/infra");
   const appStore = useAppStore();
   const infraStore = useInfraStore();
   const { extensionsArray } = await runExtensions();
   return Promise.all(
-    extensionsArray.map(async (extension) => {
+    extensionsArray.map(async (extension: Readonly<ExtensionDescriptor>) => {
       const { id, name, version, frontendContent, port } = extension;
       const blob = new Blob([frontendContent], {
         type: "application/javascript",
@@ -80,7 +102,11 @@ async function registerRunningExtensions() {
       // Extension-provided stores are expected to satisfy the fuller
       // Microservice contract (connect, etc.) even though the loader's own
       // RegisterableStore type only models what app.ts itself needs.
-      infraStore.register_microservice(store as unknown as Microservice);
+      if (isMicroservice(store)) {
+        infraStore.register_microservice(store);
+      } else {
+        console.warn("[ExtensionManager] Store does not implement Microservice:", store.$id);
+      }
       return {
         name,
         version,
@@ -90,17 +116,20 @@ async function registerRunningExtensions() {
   );
 }
 
-async function importExtensionFile(file: File) {
+async function importExtensionFile(file: Readonly<File>): Promise<RegisteredExtension[]> {
   await uploadExtension(file);
   return registerRunningExtensions();
 }
 
-async function importExtensionURL(url: DownloadExtensionParams) {
+async function importExtensionURL(
+  url: Readonly<DownloadExtensionParams>,
+): Promise<RegisteredExtension[]> {
   await downloadExtension(url);
   return registerRunningExtensions();
 }
 
 async function unloadExtension(extensionId: string): Promise<boolean> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
   const appStore = useAppStore();
   console.log("[ExtensionManager] Unloading extension:", extensionId);
   const extensionData = appStore.getExtension(extensionId);
@@ -111,21 +140,22 @@ async function unloadExtension(extensionId: string): Promise<boolean> {
 
   // Get the store if it exists
   const storeFactory = extensionData.metadata?.store;
-  if (storeFactory) {
+  if (storeFactory !== undefined) {
     const store = storeFactory();
     // Stop the microservice if possible
-    if (typeof store.kill === "function") {
-      await (store.kill as () => Promise<void>)();
+    if (store.kill) {
+      await store.kill();
     }
   }
 
   // Unload from AppStore
-  appStore.unloadExtension(extensionId);
+  await appStore.unloadExtension(extensionId);
   console.log("[ExtensionManager] Extension unloaded:", extensionId);
   return true;
 }
 
-function killExtension(extensionId: string) {
+async function killExtension(extensionId: string): Promise<unknown> {
+  const { useAppStore } = await import("@ogw_front/stores/app");
   const appStore = useAppStore();
   const { projectFolderPath } = appStore;
   const { PROJECT: projectName } = useRuntimeConfig().public;
@@ -135,10 +165,11 @@ function killExtension(extensionId: string) {
     projectFolderPath,
     projectName,
   };
-  return appStore.request({
+  const result = await appStore.request({
     schema,
     params,
   });
+  return result;
 }
 export {
   importExtensionFile,
diff --git a/app/utils/import_workflow.ts b/app/utils/import_workflow.ts
index 6a614396..8c69b4a2 100644
--- a/app/utils/import_workflow.ts
+++ b/app/utils/import_workflow.ts
@@ -3,21 +3,21 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 
 // Local imports
+import { type NewDataItem, useDataStore } from "@ogw_front/stores/data";
 import { useBackStore } from "@ogw_front/stores/back";
-import { useDataStore } from "@ogw_front/stores/data";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { NewDataItem } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
 
 interface FileToImport {
-  filename: string;
-  geode_object_type: string;
+  readonly filename: string;
+  readonly geode_object_type: string;
 }
 
-async function importItem(item: NewDataItem): Promise<string> {
+// NewDataItem has mutable array fields (mesh_components, collection_components), so Readonly<>
+// Can't satisfy prefer-readonly-parameter-types deeply; left unfixed (same pattern as app/plugins/auto_store_register.ts).
+async function importItem(item: Readonly<NewDataItem>): Promise<string> {
   const dataStore = useDataStore();
   const dataStyleStore = useDataStyleStore();
   const hybridViewerStore = useHybridViewerStore();
@@ -74,10 +74,11 @@ async function importFile(filename: string, geode_object_type: string): Promise<
     schema,
     params,
   });
+  // oxlint-disable-next-line no-unsafe-type-assertion -- this is the trusted API boundary; the back-end response shape matches NewDataItem.
   return importItem(response as NewDataItem);
 }
 
-async function importWorkflow(files: FileToImport[]): Promise<string[]> {
+async function importWorkflow(files: readonly FileToImport[]): Promise<string[]> {
   const chunk_size = 5;
   const chunks: FileToImport[][] = [];
   for (let i = 0; i < files.length; i += chunk_size) {
@@ -91,20 +92,22 @@ async function importWorkflow(files: FileToImport[]): Promise<string[]> {
     }
     const chunk = chunks[chunkIndex] ?? [];
     const chunk_results = await Promise.all(
-      chunk.map(
-        async ({ filename, geode_object_type }) => await importFile(filename, geode_object_type),
-      ),
+      chunk.map(async ({ filename, geode_object_type }) => {
+        const id = await importFile(filename, geode_object_type);
+        return id;
+      }),
     );
     results.push(...chunk_results);
     await processChunk(chunkIndex + 1);
   }
   await processChunk(0);
   const hybridViewerStore = useHybridViewerStore();
-  hybridViewerStore.remoteRender();
+  await hybridViewerStore.remoteRender();
   return results;
 }
 
-async function importWorkflowFromSnapshot(items: NewDataItem[]): Promise<string[]> {
+// NewDataItem has mutable array fields (mesh_components, collection_components), so a readonly array of it can't satisfy prefer-readonly-parameter-types deeply; left unfixed (same pattern as app/plugins/auto_store_register.ts).
+async function importWorkflowFromSnapshot(items: readonly NewDataItem[]): Promise<string[]> {
   console.log("[importWorkflowFromSnapshot] start", { count: items?.length });
   const hybridViewerStore = useHybridViewerStore();
   const chunk_size = 5;
@@ -118,12 +121,17 @@ async function importWorkflowFromSnapshot(items: NewDataItem[]): Promise<string[
       return;
     }
     const chunk = chunks[chunkIndex] ?? [];
-    const chunk_ids = await Promise.all(chunk.map((item) => importItem(item)));
+    const chunk_ids = await Promise.all(
+      chunk.map(async (item) => {
+        const id = await importItem(item);
+        return id;
+      }),
+    );
     ids.push(...chunk_ids);
     await processChunk(chunkIndex + 1);
   }
   await processChunk(0);
-  hybridViewerStore.remoteRender();
+  await hybridViewerStore.remoteRender();
   console.log("[importWorkflowFromSnapshot] done", {
     ids,
   });
diff --git a/app/utils/log.ts b/app/utils/log.ts
index 1843ced2..a5eaf1ab 100644
--- a/app/utils/log.ts
+++ b/app/utils/log.ts
@@ -4,16 +4,16 @@ interface Loggable {
   $id: string;
 }
 
-function startRequestLog(microservice: Loggable, schema: JsonRpcSchema): Date {
+function startRequestLog(microservice: Readonly<Loggable>, schema: Readonly<JsonRpcSchema>): Date {
   console.log(`[${microservice.$id}] Request:`, schema.$id);
   const requestStartingTime = new Date(Date.now());
   return requestStartingTime;
 }
 
 function endRequestLog(
-  microservice: Loggable,
-  schema: JsonRpcSchema,
-  requestStartingTime: Date,
+  microservice: Readonly<Loggable>,
+  schema: Readonly<JsonRpcSchema>,
+  requestStartingTime: Readonly<Date>,
 ): void {
   const requestEndingTime = new Date(Date.now());
   console.log(
diff --git a/app/utils/name_cleaner.ts b/app/utils/name_cleaner.ts
index 1547f3f4..87b0c8d7 100644
--- a/app/utils/name_cleaner.ts
+++ b/app/utils/name_cleaner.ts
@@ -8,7 +8,7 @@ function formatListId(
   sliceStart: number = DEFAULT_SLICE_START,
   sliceEndOffset: number = DEFAULT_SLICE_END_OFFSET,
 ): string {
-  if (!id) {
+  if (id === undefined || id === null || id === "") {
     return "";
   }
   if (id.length <= maxLength) {
diff --git a/app/utils/string.ts b/app/utils/string.ts
index ed97a3bf..76dee8f3 100644
--- a/app/utils/string.ts
+++ b/app/utils/string.ts
@@ -16,7 +16,7 @@ export function middleTruncate(
   startChars: number = DEFAULT_START_CHARS,
   endChars: number = DEFAULT_END_CHARS,
 ): string | undefined | null {
-  if (!text || text.length <= maxLength) {
+  if (text === undefined || text === null || text.length <= maxLength) {
     return text;
   }
 
diff --git a/app/utils/treeview.ts b/app/utils/treeview.ts
index 11078a3b..d9373a85 100644
--- a/app/utils/treeview.ts
+++ b/app/utils/treeview.ts
@@ -1,6 +1,6 @@
 function compareSelections<Item>(
-  current: Item[],
-  previous: Item[],
+  current: readonly Item[],
+  previous: readonly Item[],
 ): { added: Item[]; removed: Item[] } {
   const added = current.filter((item) => !previous.includes(item));
   const removed = previous.filter((item) => !current.includes(item));
diff --git a/internal/database/base_database.ts b/internal/database/base_database.ts
index 0ff2fe1d..90e65861 100644
--- a/internal/database/base_database.ts
+++ b/internal/database/base_database.ts
@@ -8,7 +8,7 @@ import { modelComponentsRelationTable } from "./tables/model_components_relation
 import { modelComponentsTable } from "./tables/model_components";
 
 export class BaseDatabase extends Dexie {
-  static get initialStores(): Record<string, string> {
+  public static get initialStores(): Record<string, string> {
     return {
       [dataTable.name]: dataTable.schema,
       [modelComponentsTable.name]: modelComponentsTable.schema,
@@ -21,7 +21,11 @@ export class BaseDatabase extends Dexie {
     };
   }
 
-  clear(): Promise<void[]> {
-    return Promise.all(this.tables.map((table) => table.clear()));
+  public async clear(): Promise<void> {
+    await Promise.all(
+      this.tables.map(async (table) => {
+        await table.clear();
+      }),
+    );
   }
 }
diff --git a/internal/database/database.ts b/internal/database/database.ts
index b89b0464..dae4d0a8 100644
--- a/internal/database/database.ts
+++ b/internal/database/database.ts
@@ -1,9 +1,5 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import { Dexie, type Table } from "dexie";
 import { BaseDatabase } from "./base_database";
-import { Dexie } from "dexie";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Table } from "dexie";
 import { ExtendedDatabase } from "./extended_database";
 
 interface DatabaseContainer {
@@ -13,17 +9,17 @@ interface DatabaseContainer {
 const databaseContainer: DatabaseContainer = { instance: undefined };
 
 class Database extends BaseDatabase {
-  constructor() {
+  public constructor() {
     super("Database");
 
     this.version(3).stores(BaseDatabase.initialStores);
   }
 
-  static async addTable(tableName: string, schemaDefinition: string): Promise<void> {
+  public static async addTable(tableName: string, schemaDefinition: string): Promise<void> {
     await this.addTables({ [tableName]: schemaDefinition });
   }
 
-  static async addTables(newTables: Record<string, string>): Promise<void> {
+  public static async addTables(newTables: Record<string, string>): Promise<void> {
     let currentVersion = 1;
     let currentStores: Record<string, string> = { ...BaseDatabase.initialStores };
 
@@ -44,10 +40,12 @@ class Database extends BaseDatabase {
       tempDb.close();
     }
 
-    const allExisting = Object.keys(newTables).every((tableName) => currentStores[tableName]);
+    const allExisting = Object.keys(newTables).every(
+      (tableName) => currentStores[tableName] !== undefined,
+    );
 
     // Set at module load time below; always defined by the time addTable/addTables runs.
-    databaseContainer.instance!.close();
+    databaseContainer.instance?.close();
 
     if (allExisting) {
       const existingDb = new Dexie("Database");
@@ -70,23 +68,35 @@ class Database extends BaseDatabase {
 
 // oxlint-disable-next-line no-top-level-await
 await Dexie.delete("Database");
-databaseContainer.instance = new Database();
-(databaseContainer.instance as Database).clear();
+const initialDatabase = new Database();
+databaseContainer.instance = initialDatabase;
+// oxlint-disable-next-line no-top-level-await
+await initialDatabase.clear();
 
 // The set of tables is assembled dynamically at runtime (Database.addTable/addTables add stores on the fly), so fully modelling this with Dexie's row generics isn't worth it here: the proxy target is typed loosely as "any table name maps to a Dexie Table of loosely-typed rows".
-interface DatabaseTables {
-  [tableName: string]: Table<Record<string, unknown>, string>;
-}
-
-const database = new Proxy({} as DatabaseTables, {
-  get(_target, prop: string | symbol) {
-    const instance = databaseContainer.instance as unknown as Record<string | symbol, unknown>;
-    const value = instance[prop];
-    if (typeof value === "function") {
-      return value.bind(databaseContainer.instance);
-    }
-    return value;
+type DatabaseTables = Record<string, Table<Record<string, unknown>, string>>;
+
+const database = new Proxy<DatabaseTables>(
+  {},
+  {
+    get(_target, prop: string | symbol): unknown {
+      // The instance is a Dexie subclass whose tables are only known dynamically at runtime.
+      // oxlint-disable-next-line no-unsafe-type-assertion
+      const instance = databaseContainer.instance as unknown as Record<string | symbol, unknown>;
+      const value = instance[prop];
+      if (typeof value === "function") {
+        // oxlint-disable-next-line no-unsafe-return
+        return value.bind(databaseContainer.instance);
+      }
+      return value;
+    },
   },
-});
+);
+
+// The proxy only knows the loose DatabaseTables shape; callers cast to the row type they know a given table holds.
+function getTable<TRow>(tableName: string): Table<TRow, string> {
+  // oxlint-disable-next-line no-unsafe-type-assertion
+  return database[tableName] as unknown as Table<TRow, string>;
+}
 
-export { Database, database };
+export { Database, database, getTable };
diff --git a/internal/database/extended_database.ts b/internal/database/extended_database.ts
index b46a8f1b..a948c349 100644
--- a/internal/database/extended_database.ts
+++ b/internal/database/extended_database.ts
@@ -1,7 +1,7 @@
 import { BaseDatabase } from "./base_database";
 
 export class ExtendedDatabase extends BaseDatabase {
-  constructor(
+  public constructor(
     currentVersion: number,
     currentStores: Record<string, string>,
     newTables: Record<string, string>,
diff --git a/internal/stores/data_style/mesh/cells/cell.ts b/internal/stores/data_style/mesh/cells/cell.ts
index fdab89ed..64407a93 100644
--- a/internal/stores/data_style/mesh/cells/cell.ts
+++ b/internal/stores/data_style/mesh/cells/cell.ts
@@ -49,10 +49,32 @@ function isMeshCellsCellAttributeValid({
 }
 
 // oxlint-disable-next-line max-lines-per-function
-function useMeshCellsCellAttributeStyle() {
+function useMeshCellsCellAttributeStyle(): {
+  meshCellsCellAttributeName: (id: string) => string | undefined;
+  meshCellsCellAttributeItem: (id: string) => number;
+  meshCellsCellAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshCellsCellAttributeColorMap: (id: string) => string | undefined;
+  meshCellsCellAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshCellsCellAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshCellsCellAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshCellsCellAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshCellsCellAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshCellsCellAttributeColorMap: (id: string, colorMap: string | undefined) => Promise<unknown>;
+  meshCellsCellAttributeNoDataColor: (id: string) => unknown;
+  setMeshCellsCellAttributeNoDataColor: (id: string, no_data_color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
   function meshCellsCellAttribute(id: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.cell shape is defined by the data style schema.
     return meshCellsCommonStyle.meshCellsColoring(id).cell as AttributeState;
   }
   function meshCellsCellAttributeStoredConfig(
@@ -61,14 +83,10 @@ function useMeshCellsCellAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshCellsCellAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -77,35 +95,41 @@ function useMeshCellsCellAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshCellsCellStyle(id: string, values: Record<string, unknown>) {
-    return meshCellsCommonStyle.mutateMeshCellsStyle(id, {
+  async function mutateMeshCellsCellStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshCellsCommonStyle.mutateMeshCellsStyle(id, {
       coloring: {
         cell: values,
       },
     });
+    return result;
   }
-  function setMeshCellsCellAttributeStoredConfig(
+  async function setMeshCellsCellAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshCellsCellStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshCellsCellStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshCellsCellAttributeName(id: string): string | undefined {
     return meshCellsCellAttribute(id).name;
   }
   function meshCellsCellAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshCellsCellAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -113,7 +137,7 @@ function useMeshCellsCellAttributeStyle() {
     const { item, name } = meshCellsCellAttribute(id);
     return item ?? meshCellsCellAttributeLastItem(id, name);
   }
-  function setMeshCellsCellAttribute(
+  async function setMeshCellsCellAttribute(
     id: string,
     {
       name,
@@ -123,18 +147,18 @@ function useMeshCellsCellAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshCellsCellStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshCellsCellStyle(id, {
       name,
       item,
     });
-    setMeshCellsCellAttributeStoredConfig(id, name, item, {
+    await setMeshCellsCellAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshCellsCellAttributeSchemas.attribute;
     const params = {
       id,
@@ -150,7 +174,7 @@ function useMeshCellsCellAttributeStyle() {
       params,
     });
   }
-  function applyCellAttribute(id: string) {
+  async function applyCellAttribute(id: string): Promise<unknown> {
     const name = meshCellsCellAttributeName(id);
     const item = meshCellsCellAttributeItem(id);
     const storedConfig = meshCellsCellAttributeStoredConfig(id, name, item);
@@ -163,19 +187,21 @@ function useMeshCellsCellAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshCellsCellAttributeValid(attribute)) {
-      return setMeshCellsCellAttribute(id, attribute);
+      const result = await setMeshCellsCellAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshCellsCellAttributeName(id: string, name: string) {
+  async function setMeshCellsCellAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshCellsCellAttributeLastItem(id, name);
-    mutateMeshCellsCellStyle(id, {
+    await mutateMeshCellsCellStyle(id, {
       name,
       item,
     });
     return applyCellAttribute(id);
   }
-  function setMeshCellsCellAttributeItem(id: string, item: number) {
-    mutateMeshCellsCellStyle(id, {
+  async function setMeshCellsCellAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshCellsCellStyle(id, {
       item,
     });
     return applyCellAttribute(id);
@@ -186,10 +212,14 @@ function useMeshCellsCellAttributeStyle() {
     const storedConfig = meshCellsCellAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshCellsCellAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshCellsCellAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshCellsCellAttributeName(id);
     const item = meshCellsCellAttributeItem(id);
-    setMeshCellsCellAttributeStoredConfig(id, name, item, {
+    await setMeshCellsCellAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -201,10 +231,13 @@ function useMeshCellsCellAttributeStyle() {
     const storedConfig = meshCellsCellAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshCellsCellAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshCellsCellAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshCellsCellAttributeName(id);
     const item = meshCellsCellAttributeItem(id);
-    setMeshCellsCellAttributeStoredConfig(id, name, item, {
+    await setMeshCellsCellAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyCellAttribute(id);
@@ -215,7 +248,10 @@ function useMeshCellsCellAttributeStyle() {
     const storedConfig = meshCellsCellAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshCellsCellAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshCellsCellAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshCellsCellAttributeName(id);
     const item = meshCellsCellAttributeItem(id);
     const storedConfig = meshCellsCellAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/cells/color.ts b/internal/stores/data_style/mesh/cells/color.ts
index 7beee580..815ddcba 100644
--- a/internal/stores/data_style/mesh/cells/color.ts
+++ b/internal/stores/data_style/mesh/cells/color.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.cells.color;
 
-export function useMeshCellsColorStyle() {
+export function useMeshCellsColorStyle(): {
+  meshCellsColor: (id: string) => unknown;
+  setMeshCellsColor: (id: string, color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
 
   function meshCellsColor(id: string): unknown {
     return meshCellsCommonStyle.meshCellsColoring(id).constant;
   }
-  function setMeshCellsColor(id: string, color: unknown) {
+  async function setMeshCellsColor(id: string, color: unknown): Promise<unknown> {
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshCellsCommonStyle.mutateMeshCellsColoring(id, {
+        response_function: async () => {
+          const mutateResult = await meshCellsCommonStyle.mutateMeshCellsColoring(id, {
             constant: color,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/cells/common.ts b/internal/stores/data_style/mesh/cells/common.ts
index a20ebc08..462969ab 100644
--- a/internal/stores/data_style/mesh/cells/common.ts
+++ b/internal/stores/data_style/mesh/cells/common.ts
@@ -1,33 +1,43 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useMeshCellsCommonStyle() {
+export function useMeshCellsCommonStyle(): {
+  meshCellsStyle: (id: string) => StyleValues;
+  meshCellsColoring: (id: string) => StyleValues;
+  mutateMeshCellsStyle: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshCellsColoring: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshCellsCellStyle: (id: string, values: StyleValues) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateMeshCellsStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateMeshCellsStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       cells: values,
     });
+    return result;
   }
 
   function meshCellsStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).cells as StyleValues;
+    return dataStyleState.getStyle(id).cells ?? {};
   }
 
   function meshCellsColoring(id: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return meshCellsStyle(id).coloring as StyleValues;
   }
 
-  function mutateMeshCellsColoring(id: string, values: StyleValues) {
-    return mutateMeshCellsStyle(id, {
+  async function mutateMeshCellsColoring(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshCellsStyle(id, {
       coloring: values,
     });
+    return result;
   }
 
-  function mutateMeshCellsCellStyle(id: string, values: StyleValues) {
-    return mutateMeshCellsColoring(id, {
+  async function mutateMeshCellsCellStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshCellsColoring(id, {
       cell: values,
     });
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/cells/index.ts b/internal/stores/data_style/mesh/cells/index.ts
index 43dd9b9d..60a781e7 100644
--- a/internal/stores/data_style/mesh/cells/index.ts
+++ b/internal/stores/data_style/mesh/cells/index.ts
@@ -3,6 +3,7 @@
 // Local imports
 import { isMeshCellsCellAttributeValid, useMeshCellsCellAttributeStyle } from "./cell";
 import { isMeshCellsVertexAttributeValid, useMeshCellsVertexAttributeStyle } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useMeshCellsColorStyle } from "./color";
 import { useMeshCellsCommonStyle } from "./common";
 import { useMeshCellsTexturesStyle } from "./textures";
@@ -10,68 +11,147 @@ import { useMeshCellsVisibilityStyle } from "./visibility";
 
 // Local constants
 
-export function useMeshCellsStyle() {
+interface MeshCellsActiveColoringDeps {
+  readonly commonStyle: Readonly<ReturnType<typeof useMeshCellsCommonStyle>>;
+  readonly colorStyle: Readonly<ReturnType<typeof useMeshCellsColorStyle>>;
+  readonly texturesStyle: Readonly<ReturnType<typeof useMeshCellsTexturesStyle>>;
+  readonly vertexAttributeStyle: Readonly<ReturnType<typeof useMeshCellsVertexAttributeStyle>>;
+  readonly cellAttributeStyle: Readonly<ReturnType<typeof useMeshCellsCellAttributeStyle>>;
+}
+
+function handleMeshCellsVertexColoring(
+  id: string,
+  vertexAttributeStyle: Readonly<ReturnType<typeof useMeshCellsVertexAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = vertexAttributeStyle.meshCellsVertexAttributeName(id);
+  const item = vertexAttributeStyle.meshCellsVertexAttributeItem(id);
+  const [minimum, maximum] = vertexAttributeStyle.meshCellsVertexAttributeRange(id);
+  const colorMap = vertexAttributeStyle.meshCellsVertexAttributeColorMap(id);
+  const vertex_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshCellsVertexAttributeValid(vertex_attribute)) {
+    return undefined;
+  }
+  return vertexAttributeStyle.setMeshCellsVertexAttribute(id, vertex_attribute);
+}
+
+function handleMeshCellsCellColoring(
+  id: string,
+  cellAttributeStyle: Readonly<ReturnType<typeof useMeshCellsCellAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = cellAttributeStyle.meshCellsCellAttributeName(id);
+  const item = cellAttributeStyle.meshCellsCellAttributeItem(id);
+  const [minimum, maximum] = cellAttributeStyle.meshCellsCellAttributeRange(id);
+  const colorMap = cellAttributeStyle.meshCellsCellAttributeColorMap(id);
+  const cell_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshCellsCellAttributeValid(cell_attribute)) {
+    return undefined;
+  }
+  return cellAttributeStyle.setMeshCellsCellAttribute(id, cell_attribute);
+}
+
+async function setMeshCellsActiveColoring(
+  id: string,
+  type: string | undefined,
+  deps: Readonly<MeshCellsActiveColoringDeps>,
+): Promise<unknown> {
+  await deps.commonStyle.mutateMeshCellsStyle(id, {
+    coloring: { active: type },
+  });
+  if (type === "constant") {
+    const result = await deps.colorStyle.setMeshCellsColor(id, deps.colorStyle.meshCellsColor(id));
+    return result;
+  }
+  if (type === "textures") {
+    const result = await deps.texturesStyle.setMeshCellsTextures(
+      id,
+      deps.texturesStyle.meshCellsTextures(id),
+    );
+    return result;
+  }
+  if (type === "vertex") {
+    const result = await handleMeshCellsVertexColoring(id, deps.vertexAttributeStyle);
+    return result;
+  }
+  if (type === "cell") {
+    const result = await handleMeshCellsCellColoring(id, deps.cellAttributeStyle);
+    return result;
+  }
+  throw new Error(`Unknown mesh cells coloring type: ${type}`);
+}
+
+async function applyMeshCellsStyle(
+  id: string,
+  visibilityStyle: Readonly<ReturnType<typeof useMeshCellsVisibilityStyle>>,
+  activeColoringType: string | undefined,
+  deps: Readonly<MeshCellsActiveColoringDeps>,
+): Promise<unknown[]> {
+  const result = await Promise.all([
+    visibilityStyle.setMeshCellsVisibility(id, visibilityStyle.meshCellsVisibility(id)),
+    setMeshCellsActiveColoring(id, activeColoringType, deps),
+  ]);
+  return result;
+}
+
+type UseMeshCellsStyleReturn = ReturnType<typeof useMeshCellsCommonStyle> & {
+  meshCellsColoring: (id: string) => StyleValues;
+  meshCellsActiveColoring: (id: string) => string | undefined;
+  setMeshCellsActiveColoring: (id: string, type: string | undefined) => Promise<unknown>;
+  applyMeshCellsStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshCellsVisibilityStyle> &
+  ReturnType<typeof useMeshCellsColorStyle> &
+  ReturnType<typeof useMeshCellsTexturesStyle> &
+  ReturnType<typeof useMeshCellsVertexAttributeStyle> &
+  ReturnType<typeof useMeshCellsCellAttributeStyle>;
+
+export function useMeshCellsStyle(): UseMeshCellsStyleReturn {
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
   const meshCellsVisibility = useMeshCellsVisibilityStyle();
   const meshCellsColorStyle = useMeshCellsColorStyle();
   const meshCellsTexturesStore = useMeshCellsTexturesStyle();
+  const meshCellsVertexAttributeStyle = useMeshCellsVertexAttributeStyle();
+  const meshCellsCellAttributeStyle = useMeshCellsCellAttributeStyle();
+
+  const activeColoringDeps: MeshCellsActiveColoringDeps = {
+    commonStyle: meshCellsCommonStyle,
+    colorStyle: meshCellsColorStyle,
+    texturesStyle: meshCellsTexturesStore,
+    vertexAttributeStyle: meshCellsVertexAttributeStyle,
+    cellAttributeStyle: meshCellsCellAttributeStyle,
+  };
 
-  function meshCellsColoring(id: string) {
+  function meshCellsColoring(id: string): StyleValues {
     return meshCellsCommonStyle.meshCellsColoring(id);
   }
-  const meshCellsVertexAttributeStyle = useMeshCellsVertexAttributeStyle();
-  const meshCellsCellAttributeStyle = useMeshCellsCellAttributeStyle();
 
   function meshCellsActiveColoring(id: string): string | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.active is defined as string in the data style schema.
     return meshCellsColoring(id).active as string | undefined;
   }
 
-  async function setMeshCellsActiveColoring(id: string, type: string | undefined) {
-    await meshCellsCommonStyle.mutateMeshCellsStyle(id, {
-      coloring: { active: type },
-    });
-    if (type === "constant") {
-      return meshCellsColorStyle.setMeshCellsColor(id, meshCellsColorStyle.meshCellsColor(id));
-    } else if (type === "textures") {
-      const textures = meshCellsTexturesStore.meshCellsTextures(id);
-      return meshCellsTexturesStore.setMeshCellsTextures(id, textures);
-    } else if (type === "vertex") {
-      const name = meshCellsVertexAttributeStyle.meshCellsVertexAttributeName(id);
-      const item = meshCellsVertexAttributeStyle.meshCellsVertexAttributeItem(id);
-      const [minimum, maximum] = meshCellsVertexAttributeStyle.meshCellsVertexAttributeRange(id);
-      const colorMap = meshCellsVertexAttributeStyle.meshCellsVertexAttributeColorMap(id);
-      const vertex_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshCellsVertexAttributeValid(vertex_attribute)) {
-        return;
-      }
-      return meshCellsVertexAttributeStyle.setMeshCellsVertexAttribute(id, vertex_attribute);
-    } else if (type === "cell") {
-      const name = meshCellsCellAttributeStyle.meshCellsCellAttributeName(id);
-      const item = meshCellsCellAttributeStyle.meshCellsCellAttributeItem(id);
-      const [minimum, maximum] = meshCellsCellAttributeStyle.meshCellsCellAttributeRange(id);
-      const colorMap = meshCellsCellAttributeStyle.meshCellsCellAttributeColorMap(id);
-      const cell_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshCellsCellAttributeValid(cell_attribute)) {
-        return;
-      }
-      return meshCellsCellAttributeStyle.setMeshCellsCellAttribute(id, cell_attribute);
-    }
-    throw new Error(`Unknown mesh cells coloring type: ${type}`);
+  async function boundSetMeshCellsActiveColoring(
+    id: string,
+    type: string | undefined,
+  ): Promise<unknown> {
+    const result = await setMeshCellsActiveColoring(id, type, activeColoringDeps);
+    return result;
   }
 
-  function applyMeshCellsStyle(id: string) {
-    return Promise.all([
-      meshCellsVisibility.setMeshCellsVisibility(id, meshCellsVisibility.meshCellsVisibility(id)),
-      setMeshCellsActiveColoring(id, meshCellsActiveColoring(id)),
-    ]);
+  async function boundApplyMeshCellsStyle(id: string): Promise<unknown[]> {
+    const result = await applyMeshCellsStyle(
+      id,
+      meshCellsVisibility,
+      meshCellsActiveColoring(id),
+      activeColoringDeps,
+    );
+    return result;
   }
 
   return {
     ...meshCellsCommonStyle,
     meshCellsColoring,
     meshCellsActiveColoring,
-    setMeshCellsActiveColoring,
-    applyMeshCellsStyle,
+    setMeshCellsActiveColoring: boundSetMeshCellsActiveColoring,
+    applyMeshCellsStyle: boundApplyMeshCellsStyle,
     ...meshCellsVisibility,
     ...meshCellsColorStyle,
     ...meshCellsTexturesStore,
diff --git a/internal/stores/data_style/mesh/cells/textures.ts b/internal/stores/data_style/mesh/cells/textures.ts
index c2f2002e..635bd2aa 100644
--- a/internal/stores/data_style/mesh/cells/textures.ts
+++ b/internal/stores/data_style/mesh/cells/textures.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.apply_textures;
 
-export function useMeshCellsTexturesStyle() {
+export function useMeshCellsTexturesStyle(): {
+  meshCellsTextures: (id: string) => unknown;
+  setMeshCellsTextures: (id: string, textures: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
 
   function meshCellsTextures(id: string): unknown {
     return meshCellsCommonStyle.meshCellsColoring(id).textures;
   }
-  function setMeshCellsTextures(id: string, textures: unknown) {
+  async function setMeshCellsTextures(id: string, textures: unknown): Promise<unknown> {
     const params = { id, textures };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshCellsCommonStyle.mutateMeshCellsStyle(id, {
+        response_function: async () => {
+          const mutateResult = await meshCellsCommonStyle.mutateMeshCellsStyle(id, {
             coloring: { textures },
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/cells/vertex.ts b/internal/stores/data_style/mesh/cells/vertex.ts
index e8f5907b..2dcf7f85 100644
--- a/internal/stores/data_style/mesh/cells/vertex.ts
+++ b/internal/stores/data_style/mesh/cells/vertex.ts
@@ -49,11 +49,38 @@ function isMeshCellsVertexAttributeValid({
   );
 }
 
+interface UseMeshCellsVertexAttributeStyleReturn {
+  meshCellsVertexAttributeName: (id: string) => string | undefined;
+  meshCellsVertexAttributeItem: (id: string) => number;
+  meshCellsVertexAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshCellsVertexAttributeColorMap: (id: string) => string | undefined;
+  meshCellsVertexAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshCellsVertexAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshCellsVertexAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshCellsVertexAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshCellsVertexAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshCellsVertexAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshCellsVertexAttributeNoDataColor: (id: string) => unknown;
+  setMeshCellsVertexAttributeNoDataColor: (id: string, no_data_color: unknown) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useMeshCellsVertexAttributeStyle() {
+function useMeshCellsVertexAttributeStyle(): UseMeshCellsVertexAttributeStyleReturn {
   const viewerStore = useViewerStore();
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
   function meshCellsVertexAttribute(id: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
     return meshCellsCommonStyle.meshCellsColoring(id).vertex as AttributeState;
   }
   function meshCellsVertexAttributeStoredConfig(
@@ -62,14 +89,10 @@ function useMeshCellsVertexAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshCellsVertexAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -78,35 +101,41 @@ function useMeshCellsVertexAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshCellsVertexStyle(id: string, values: Record<string, unknown>) {
-    return meshCellsCommonStyle.mutateMeshCellsStyle(id, {
+  async function mutateMeshCellsVertexStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshCellsCommonStyle.mutateMeshCellsStyle(id, {
       coloring: {
         vertex: values,
       },
     });
+    return result;
   }
-  function setMeshCellsVertexAttributeStoredConfig(
+  async function setMeshCellsVertexAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshCellsVertexStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshCellsVertexStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshCellsVertexAttributeName(id: string): string | undefined {
     return meshCellsVertexAttribute(id).name;
   }
   function meshCellsVertexAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshCellsVertexAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -114,7 +143,7 @@ function useMeshCellsVertexAttributeStyle() {
     const { item, name } = meshCellsVertexAttribute(id);
     return item ?? meshCellsVertexAttributeLastItem(id, name);
   }
-  function setMeshCellsVertexAttribute(
+  async function setMeshCellsVertexAttribute(
     id: string,
     {
       name,
@@ -124,18 +153,18 @@ function useMeshCellsVertexAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshCellsVertexStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshCellsVertexStyle(id, {
       name,
       item,
     });
-    setMeshCellsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshCellsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshCellsVertexAttributeSchemas.attribute;
     const params = {
       id,
@@ -151,7 +180,7 @@ function useMeshCellsVertexAttributeStyle() {
       params,
     });
   }
-  function applyVertexAttribute(id: string) {
+  async function applyVertexAttribute(id: string): Promise<unknown> {
     const name = meshCellsVertexAttributeName(id);
     const item = meshCellsVertexAttributeItem(id);
     const storedConfig = meshCellsVertexAttributeStoredConfig(id, name, item);
@@ -164,19 +193,21 @@ function useMeshCellsVertexAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshCellsVertexAttributeValid(attribute)) {
-      return setMeshCellsVertexAttribute(id, attribute);
+      const result = await setMeshCellsVertexAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshCellsVertexAttributeName(id: string, name: string) {
+  async function setMeshCellsVertexAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshCellsVertexAttributeLastItem(id, name);
-    mutateMeshCellsVertexStyle(id, {
+    await mutateMeshCellsVertexStyle(id, {
       name,
       item,
     });
     return applyVertexAttribute(id);
   }
-  function setMeshCellsVertexAttributeItem(id: string, item: number) {
-    mutateMeshCellsVertexStyle(id, {
+  async function setMeshCellsVertexAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshCellsVertexStyle(id, {
       item,
     });
     return applyVertexAttribute(id);
@@ -187,10 +218,14 @@ function useMeshCellsVertexAttributeStyle() {
     const storedConfig = meshCellsVertexAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshCellsVertexAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshCellsVertexAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshCellsVertexAttributeName(id);
     const item = meshCellsVertexAttributeItem(id);
-    setMeshCellsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshCellsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -202,10 +237,13 @@ function useMeshCellsVertexAttributeStyle() {
     const storedConfig = meshCellsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshCellsVertexAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshCellsVertexAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshCellsVertexAttributeName(id);
     const item = meshCellsVertexAttributeItem(id);
-    setMeshCellsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshCellsVertexAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyVertexAttribute(id);
@@ -216,7 +254,10 @@ function useMeshCellsVertexAttributeStyle() {
     const storedConfig = meshCellsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshCellsVertexAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshCellsVertexAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshCellsVertexAttributeName(id);
     const item = meshCellsVertexAttributeItem(id);
     const storedConfig = meshCellsVertexAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/cells/visibility.ts b/internal/stores/data_style/mesh/cells/visibility.ts
index ed0ac02e..d0b63f4e 100644
--- a/internal/stores/data_style/mesh/cells/visibility.ts
+++ b/internal/stores/data_style/mesh/cells/visibility.ts
@@ -8,24 +8,35 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.cells.visibility;
 
-export function useMeshCellsVisibilityStyle() {
+export function useMeshCellsVisibilityStyle(): {
+  meshCellsVisibility: (id: string) => boolean | undefined;
+  setMeshCellsVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshCellsCommonStyle = useMeshCellsCommonStyle();
 
   function meshCellsVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility is defined as boolean in the data style schema.
     return meshCellsCommonStyle.meshCellsStyle(id).visibility as boolean | undefined;
   }
-  function setMeshCellsVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshCellsVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => meshCellsCommonStyle.mutateMeshCellsStyle(id, { visibility }),
+        response_function: async () => {
+          const mutateResult = await meshCellsCommonStyle.mutateMeshCellsStyle(id, { visibility });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/edges/color.ts b/internal/stores/data_style/mesh/edges/color.ts
index 43878484..eea53df0 100644
--- a/internal/stores/data_style/mesh/edges/color.ts
+++ b/internal/stores/data_style/mesh/edges/color.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.edges.color;
 
-export function useMeshEdgesColorStyle() {
+export function useMeshEdgesColorStyle(): {
+  meshEdgesColor: (id: string) => unknown;
+  setMeshEdgesColor: (id: string, color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
 
   function meshEdgesColor(id: string): unknown {
     return meshEdgesCommonStyle.meshEdgesColoring(id).constant;
   }
-  function setMeshEdgesColor(id: string, color: unknown) {
+  async function setMeshEdgesColor(id: string, color: unknown): Promise<unknown> {
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshEdgesCommonStyle.mutateMeshEdgesColoring(id, {
+        response_function: async () => {
+          const mutateResult = await meshEdgesCommonStyle.mutateMeshEdgesColoring(id, {
             constant: color,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/edges/common.ts b/internal/stores/data_style/mesh/edges/common.ts
index 1a011c47..58604e44 100644
--- a/internal/stores/data_style/mesh/edges/common.ts
+++ b/internal/stores/data_style/mesh/edges/common.ts
@@ -1,27 +1,35 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useMeshEdgesCommonStyle() {
+export function useMeshEdgesCommonStyle(): {
+  meshEdgesStyle: (id: string) => StyleValues;
+  meshEdgesColoring: (id: string) => StyleValues;
+  mutateMeshEdgesStyle: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshEdgesColoring: (id: string, values: StyleValues) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateMeshEdgesStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateMeshEdgesStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       edges: values,
     });
+    return result;
   }
 
   function meshEdgesStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).edges as StyleValues;
+    return dataStyleState.getStyle(id).edges ?? {};
   }
 
   function meshEdgesColoring(id: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return meshEdgesStyle(id).coloring as StyleValues;
   }
 
-  function mutateMeshEdgesColoring(id: string, values: StyleValues) {
-    return mutateMeshEdgesStyle(id, {
+  async function mutateMeshEdgesColoring(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshEdgesStyle(id, {
       coloring: values,
     });
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/edges/edge.ts b/internal/stores/data_style/mesh/edges/edge.ts
index 1e0759e4..53c6a377 100644
--- a/internal/stores/data_style/mesh/edges/edge.ts
+++ b/internal/stores/data_style/mesh/edges/edge.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshEdgesCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -50,14 +49,33 @@ function isMeshEdgesEdgeAttributeValid({
 }
 
 // oxlint-disable-next-line max-lines-per-function
-function useMeshEdgesEdgeAttributeStyle() {
+function useMeshEdgesEdgeAttributeStyle(): {
+  meshEdgesEdgeAttributeName: (id: string) => string | undefined;
+  meshEdgesEdgeAttributeItem: (id: string) => number;
+  meshEdgesEdgeAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshEdgesEdgeAttributeColorMap: (id: string) => string | undefined;
+  meshEdgesEdgeAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshEdgesEdgeAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshEdgesEdgeAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshEdgesEdgeAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshEdgesEdgeAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshEdgesEdgeAttributeColorMap: (id: string, colorMap: string | undefined) => Promise<unknown>;
+  meshEdgesEdgeAttributeNoDataColor: (id: string) => unknown;
+  setMeshEdgesEdgeAttributeNoDataColor: (id: string, no_data_color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
-  function meshEdgesColoring(id: string): StyleValues {
-    return meshEdgesCommonStyle.meshEdgesStyle(id).coloring as StyleValues;
-  }
   function meshEdgesEdgeAttribute(id: string): AttributeState {
-    return meshEdgesColoring(id).edge as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.edge shape is defined by the data style schema.
+    return meshEdgesCommonStyle.meshEdgesColoring(id).edge as AttributeState;
   }
   function meshEdgesEdgeAttributeStoredConfig(
     id: string,
@@ -65,14 +83,10 @@ function useMeshEdgesEdgeAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshEdgesEdgeAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -81,35 +95,41 @@ function useMeshEdgesEdgeAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshEdgesEdgeStyle(id: string, values: Record<string, unknown>) {
-    return meshEdgesCommonStyle.mutateMeshEdgesStyle(id, {
+  async function mutateMeshEdgesEdgeStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshEdgesCommonStyle.mutateMeshEdgesStyle(id, {
       coloring: {
         edge: values,
       },
     });
+    return result;
   }
-  function setMeshEdgesEdgeAttributeStoredConfig(
+  async function setMeshEdgesEdgeAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshEdgesEdgeStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshEdgesEdgeStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshEdgesEdgeAttributeName(id: string): string | undefined {
     return meshEdgesEdgeAttribute(id).name;
   }
   function meshEdgesEdgeAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshEdgesEdgeAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -117,7 +137,7 @@ function useMeshEdgesEdgeAttributeStyle() {
     const { item, name } = meshEdgesEdgeAttribute(id);
     return item ?? meshEdgesEdgeAttributeLastItem(id, name);
   }
-  function setMeshEdgesEdgeAttribute(
+  async function setMeshEdgesEdgeAttribute(
     id: string,
     {
       name,
@@ -127,18 +147,18 @@ function useMeshEdgesEdgeAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshEdgesEdgeStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshEdgesEdgeStyle(id, {
       name,
       item,
     });
-    setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshEdgesEdgeAttributeSchemas.attribute;
     const params = {
       id,
@@ -154,7 +174,7 @@ function useMeshEdgesEdgeAttributeStyle() {
       params,
     });
   }
-  function applyEdgeAttribute(id: string) {
+  async function applyEdgeAttribute(id: string): Promise<unknown> {
     const name = meshEdgesEdgeAttributeName(id);
     const item = meshEdgesEdgeAttributeItem(id);
     const storedConfig = meshEdgesEdgeAttributeStoredConfig(id, name, item);
@@ -167,19 +187,21 @@ function useMeshEdgesEdgeAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshEdgesEdgeAttributeValid(attribute)) {
-      return setMeshEdgesEdgeAttribute(id, attribute);
+      const result = await setMeshEdgesEdgeAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshEdgesEdgeAttributeName(id: string, name: string) {
+  async function setMeshEdgesEdgeAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshEdgesEdgeAttributeLastItem(id, name);
-    mutateMeshEdgesEdgeStyle(id, {
+    await mutateMeshEdgesEdgeStyle(id, {
       name,
       item,
     });
     return applyEdgeAttribute(id);
   }
-  function setMeshEdgesEdgeAttributeItem(id: string, item: number) {
-    mutateMeshEdgesEdgeStyle(id, {
+  async function setMeshEdgesEdgeAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshEdgesEdgeStyle(id, {
       item,
     });
     return applyEdgeAttribute(id);
@@ -190,10 +212,14 @@ function useMeshEdgesEdgeAttributeStyle() {
     const storedConfig = meshEdgesEdgeAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshEdgesEdgeAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshEdgesEdgeAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshEdgesEdgeAttributeName(id);
     const item = meshEdgesEdgeAttributeItem(id);
-    setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -205,10 +231,13 @@ function useMeshEdgesEdgeAttributeStyle() {
     const storedConfig = meshEdgesEdgeAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshEdgesEdgeAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshEdgesEdgeAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshEdgesEdgeAttributeName(id);
     const item = meshEdgesEdgeAttributeItem(id);
-    setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesEdgeAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyEdgeAttribute(id);
@@ -219,7 +248,10 @@ function useMeshEdgesEdgeAttributeStyle() {
     const storedConfig = meshEdgesEdgeAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshEdgesEdgeAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshEdgesEdgeAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshEdgesEdgeAttributeName(id);
     const item = meshEdgesEdgeAttributeItem(id);
     const storedConfig = meshEdgesEdgeAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/edges/index.ts b/internal/stores/data_style/mesh/edges/index.ts
index 540849a4..08f9c929 100644
--- a/internal/stores/data_style/mesh/edges/index.ts
+++ b/internal/stores/data_style/mesh/edges/index.ts
@@ -3,6 +3,7 @@
 // Local imports
 import { isMeshEdgesEdgeAttributeValid, useMeshEdgesEdgeAttributeStyle } from "./edge";
 import { isMeshEdgesVertexAttributeValid, useMeshEdgesVertexAttributeStyle } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useMeshEdgesColorStyle } from "./color";
 import { useMeshEdgesCommonStyle } from "./common";
 import { useMeshEdgesVisibilityStyle } from "./visibility";
@@ -10,67 +11,141 @@ import { useMeshEdgesWidthStyle } from "./width";
 
 // Local constants
 
-export function useMeshEdgesStyle() {
+interface MeshEdgesActiveColoringDeps {
+  readonly commonStyle: Readonly<ReturnType<typeof useMeshEdgesCommonStyle>>;
+  readonly colorStyle: Readonly<ReturnType<typeof useMeshEdgesColorStyle>>;
+  readonly vertexAttributeStyle: Readonly<ReturnType<typeof useMeshEdgesVertexAttributeStyle>>;
+  readonly edgeAttributeStyle: Readonly<ReturnType<typeof useMeshEdgesEdgeAttributeStyle>>;
+}
+
+function handleMeshEdgesVertexColoring(
+  id: string,
+  vertexAttributeStyle: Readonly<ReturnType<typeof useMeshEdgesVertexAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = vertexAttributeStyle.meshEdgesVertexAttributeName(id);
+  const item = vertexAttributeStyle.meshEdgesVertexAttributeItem(id);
+  const [minimum, maximum] = vertexAttributeStyle.meshEdgesVertexAttributeRange(id);
+  const colorMap = vertexAttributeStyle.meshEdgesVertexAttributeColorMap(id);
+  const vertex_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshEdgesVertexAttributeValid(vertex_attribute)) {
+    return undefined;
+  }
+  return vertexAttributeStyle.setMeshEdgesVertexAttribute(id, vertex_attribute);
+}
+
+function handleMeshEdgesEdgeColoring(
+  id: string,
+  edgeAttributeStyle: Readonly<ReturnType<typeof useMeshEdgesEdgeAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = edgeAttributeStyle.meshEdgesEdgeAttributeName(id);
+  const item = edgeAttributeStyle.meshEdgesEdgeAttributeItem(id);
+  const [minimum, maximum] = edgeAttributeStyle.meshEdgesEdgeAttributeRange(id);
+  const colorMap = edgeAttributeStyle.meshEdgesEdgeAttributeColorMap(id);
+  const edge_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshEdgesEdgeAttributeValid(edge_attribute)) {
+    return undefined;
+  }
+  return edgeAttributeStyle.setMeshEdgesEdgeAttribute(id, edge_attribute);
+}
+
+async function setMeshEdgesActiveColoring(
+  id: string,
+  type: string | undefined,
+  deps: Readonly<MeshEdgesActiveColoringDeps>,
+): Promise<unknown> {
+  await deps.commonStyle.mutateMeshEdgesStyle(id, {
+    coloring: { active: type },
+  });
+  if (type === "constant") {
+    const result = await deps.colorStyle.setMeshEdgesColor(id, deps.colorStyle.meshEdgesColor(id));
+    return result;
+  }
+  if (type === "vertex") {
+    const result = await handleMeshEdgesVertexColoring(id, deps.vertexAttributeStyle);
+    return result;
+  }
+  if (type === "edge") {
+    const result = await handleMeshEdgesEdgeColoring(id, deps.edgeAttributeStyle);
+    return result;
+  }
+  throw new Error(`Unknown mesh edges coloring type: ${type}`);
+}
+
+async function applyMeshEdgesStyle(
+  id: string,
+  visibilityStyle: Readonly<ReturnType<typeof useMeshEdgesVisibilityStyle>>,
+  widthStyle: Readonly<ReturnType<typeof useMeshEdgesWidthStyle>>,
+  activeColoringType: string | undefined,
+  deps: Readonly<MeshEdgesActiveColoringDeps>,
+): Promise<unknown[]> {
+  const result = await Promise.all([
+    visibilityStyle.setMeshEdgesVisibility(id, visibilityStyle.meshEdgesVisibility(id)),
+    widthStyle.setMeshEdgesWidth(id, widthStyle.meshEdgesWidth(id)),
+    setMeshEdgesActiveColoring(id, activeColoringType, deps),
+  ]);
+  return result;
+}
+
+type UseMeshEdgesStyleReturn = ReturnType<typeof useMeshEdgesCommonStyle> & {
+  meshEdgesColoring: (id: string) => StyleValues;
+  meshEdgesActiveColoring: (id: string) => string | undefined;
+  setMeshEdgesActiveColoring: (id: string, type: string | undefined) => Promise<unknown>;
+  applyMeshEdgesStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshEdgesVisibilityStyle> &
+  ReturnType<typeof useMeshEdgesColorStyle> &
+  ReturnType<typeof useMeshEdgesWidthStyle> &
+  ReturnType<typeof useMeshEdgesVertexAttributeStyle> &
+  ReturnType<typeof useMeshEdgesEdgeAttributeStyle>;
+
+export function useMeshEdgesStyle(): UseMeshEdgesStyleReturn {
+  const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
   const meshEdgesVisibility = useMeshEdgesVisibilityStyle();
   const meshEdgesColorStyle = useMeshEdgesColorStyle();
   const meshEdgesWidthStyle = useMeshEdgesWidthStyle();
   const meshEdgesVertexAttributeStyle = useMeshEdgesVertexAttributeStyle();
   const meshEdgesEdgeAttributeStyle = useMeshEdgesEdgeAttributeStyle();
-  const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
 
-  function meshEdgesColoring(id: string) {
+  const activeColoringDeps: MeshEdgesActiveColoringDeps = {
+    commonStyle: meshEdgesCommonStyle,
+    colorStyle: meshEdgesColorStyle,
+    vertexAttributeStyle: meshEdgesVertexAttributeStyle,
+    edgeAttributeStyle: meshEdgesEdgeAttributeStyle,
+  };
+
+  function meshEdgesColoring(id: string): StyleValues {
     return meshEdgesCommonStyle.meshEdgesColoring(id);
   }
 
   function meshEdgesActiveColoring(id: string): string | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.active is defined as string in the data style schema.
     return meshEdgesColoring(id).active as string | undefined;
   }
 
-  async function setMeshEdgesActiveColoring(id: string, type: string | undefined) {
-    await meshEdgesCommonStyle.mutateMeshEdgesStyle(id, {
-      coloring: { active: type },
-    });
-    if (type === "constant") {
-      return meshEdgesColorStyle.setMeshEdgesColor(id, meshEdgesColorStyle.meshEdgesColor(id));
-    }
-    if (type === "vertex") {
-      const name = meshEdgesVertexAttributeStyle.meshEdgesVertexAttributeName(id);
-      const item = meshEdgesVertexAttributeStyle.meshEdgesVertexAttributeItem(id);
-      const [minimum, maximum] = meshEdgesVertexAttributeStyle.meshEdgesVertexAttributeRange(id);
-      const colorMap = meshEdgesVertexAttributeStyle.meshEdgesVertexAttributeColorMap(id);
-      const vertex_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshEdgesVertexAttributeValid(vertex_attribute)) {
-        return;
-      }
-      return meshEdgesVertexAttributeStyle.setMeshEdgesVertexAttribute(id, vertex_attribute);
-    }
-    if (type === "edge") {
-      const name = meshEdgesEdgeAttributeStyle.meshEdgesEdgeAttributeName(id);
-      const item = meshEdgesEdgeAttributeStyle.meshEdgesEdgeAttributeItem(id);
-      const [minimum, maximum] = meshEdgesEdgeAttributeStyle.meshEdgesEdgeAttributeRange(id);
-      const colorMap = meshEdgesEdgeAttributeStyle.meshEdgesEdgeAttributeColorMap(id);
-      const edge_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshEdgesEdgeAttributeValid(edge_attribute)) {
-        return;
-      }
-      return meshEdgesEdgeAttributeStyle.setMeshEdgesEdgeAttribute(id, edge_attribute);
-    }
-    throw new Error(`Unknown mesh edges coloring type: ${type}`);
+  async function boundSetMeshEdgesActiveColoring(
+    id: string,
+    type: string | undefined,
+  ): Promise<unknown> {
+    const result = await setMeshEdgesActiveColoring(id, type, activeColoringDeps);
+    return result;
   }
 
-  function applyMeshEdgesStyle(id: string) {
-    return Promise.all([
-      meshEdgesVisibility.setMeshEdgesVisibility(id, meshEdgesVisibility.meshEdgesVisibility(id)),
-      meshEdgesWidthStyle.setMeshEdgesWidth(id, meshEdgesWidthStyle.meshEdgesWidth(id)),
-      setMeshEdgesActiveColoring(id, meshEdgesActiveColoring(id)),
-    ]);
+  async function boundApplyMeshEdgesStyle(id: string): Promise<unknown[]> {
+    const result = await applyMeshEdgesStyle(
+      id,
+      meshEdgesVisibility,
+      meshEdgesWidthStyle,
+      meshEdgesActiveColoring(id),
+      activeColoringDeps,
+    );
+    return result;
   }
 
   return {
-    meshEdgesActiveColoring,
-    setMeshEdgesActiveColoring,
-    applyMeshEdgesStyle,
     ...meshEdgesCommonStyle,
+    meshEdgesColoring,
+    meshEdgesActiveColoring,
+    setMeshEdgesActiveColoring: boundSetMeshEdgesActiveColoring,
+    applyMeshEdgesStyle: boundApplyMeshEdgesStyle,
     ...meshEdgesVisibility,
     ...meshEdgesColorStyle,
     ...meshEdgesWidthStyle,
diff --git a/internal/stores/data_style/mesh/edges/vertex.ts b/internal/stores/data_style/mesh/edges/vertex.ts
index 2ae640b0..6b1937c9 100644
--- a/internal/stores/data_style/mesh/edges/vertex.ts
+++ b/internal/stores/data_style/mesh/edges/vertex.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshEdgesCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -50,15 +49,39 @@ function isMeshEdgesVertexAttributeValid({
   );
 }
 
+interface UseMeshEdgesVertexAttributeStyleReturn {
+  meshEdgesVertexAttributeName: (id: string) => string | undefined;
+  meshEdgesVertexAttributeItem: (id: string) => number;
+  meshEdgesVertexAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshEdgesVertexAttributeColorMap: (id: string) => string | undefined;
+  meshEdgesVertexAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshEdgesVertexAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshEdgesVertexAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshEdgesVertexAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshEdgesVertexAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshEdgesVertexAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshEdgesVertexAttributeNoDataColor: (id: string) => unknown;
+  setMeshEdgesVertexAttributeNoDataColor: (id: string, no_data_color: unknown) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useMeshEdgesVertexAttributeStyle() {
+function useMeshEdgesVertexAttributeStyle(): UseMeshEdgesVertexAttributeStyleReturn {
   const viewerStore = useViewerStore();
   const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
-  function meshEdgesColoring(id: string): StyleValues {
-    return meshEdgesCommonStyle.meshEdgesStyle(id).coloring as StyleValues;
-  }
   function meshEdgesVertexAttribute(id: string): AttributeState {
-    return meshEdgesColoring(id).vertex as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
+    return meshEdgesCommonStyle.meshEdgesColoring(id).vertex as AttributeState;
   }
   function meshEdgesVertexAttributeStoredConfig(
     id: string,
@@ -66,14 +89,10 @@ function useMeshEdgesVertexAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshEdgesVertexAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,35 +101,41 @@ function useMeshEdgesVertexAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshEdgesVertexStyle(id: string, values: Record<string, unknown>) {
-    return meshEdgesCommonStyle.mutateMeshEdgesStyle(id, {
+  async function mutateMeshEdgesVertexStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshEdgesCommonStyle.mutateMeshEdgesStyle(id, {
       coloring: {
         vertex: values,
       },
     });
+    return result;
   }
-  function setMeshEdgesVertexAttributeStoredConfig(
+  async function setMeshEdgesVertexAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshEdgesVertexStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshEdgesVertexStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshEdgesVertexAttributeName(id: string): string | undefined {
     return meshEdgesVertexAttribute(id).name;
   }
   function meshEdgesVertexAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshEdgesVertexAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -118,7 +143,7 @@ function useMeshEdgesVertexAttributeStyle() {
     const { item, name } = meshEdgesVertexAttribute(id);
     return item ?? meshEdgesVertexAttributeLastItem(id, name);
   }
-  function setMeshEdgesVertexAttribute(
+  async function setMeshEdgesVertexAttribute(
     id: string,
     {
       name,
@@ -128,18 +153,18 @@ function useMeshEdgesVertexAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshEdgesVertexStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshEdgesVertexStyle(id, {
       name,
       item,
     });
-    setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshEdgesVertexAttributeSchemas.attribute;
     const params = {
       id,
@@ -155,7 +180,7 @@ function useMeshEdgesVertexAttributeStyle() {
       params,
     });
   }
-  function applyVertexAttribute(id: string) {
+  async function applyVertexAttribute(id: string): Promise<unknown> {
     const name = meshEdgesVertexAttributeName(id);
     const item = meshEdgesVertexAttributeItem(id);
     const storedConfig = meshEdgesVertexAttributeStoredConfig(id, name, item);
@@ -168,19 +193,21 @@ function useMeshEdgesVertexAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshEdgesVertexAttributeValid(attribute)) {
-      return setMeshEdgesVertexAttribute(id, attribute);
+      const result = await setMeshEdgesVertexAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshEdgesVertexAttributeName(id: string, name: string) {
+  async function setMeshEdgesVertexAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshEdgesVertexAttributeLastItem(id, name);
-    mutateMeshEdgesVertexStyle(id, {
+    await mutateMeshEdgesVertexStyle(id, {
       name,
       item,
     });
     return applyVertexAttribute(id);
   }
-  function setMeshEdgesVertexAttributeItem(id: string, item: number) {
-    mutateMeshEdgesVertexStyle(id, {
+  async function setMeshEdgesVertexAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshEdgesVertexStyle(id, {
       item,
     });
     return applyVertexAttribute(id);
@@ -191,10 +218,14 @@ function useMeshEdgesVertexAttributeStyle() {
     const storedConfig = meshEdgesVertexAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshEdgesVertexAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshEdgesVertexAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshEdgesVertexAttributeName(id);
     const item = meshEdgesVertexAttributeItem(id);
-    setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -206,10 +237,13 @@ function useMeshEdgesVertexAttributeStyle() {
     const storedConfig = meshEdgesVertexAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshEdgesVertexAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshEdgesVertexAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshEdgesVertexAttributeName(id);
     const item = meshEdgesVertexAttributeItem(id);
-    setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
+    await setMeshEdgesVertexAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyVertexAttribute(id);
@@ -220,7 +254,10 @@ function useMeshEdgesVertexAttributeStyle() {
     const storedConfig = meshEdgesVertexAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshEdgesVertexAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshEdgesVertexAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshEdgesVertexAttributeName(id);
     const item = meshEdgesVertexAttributeItem(id);
     const storedConfig = meshEdgesVertexAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/edges/visibility.ts b/internal/stores/data_style/mesh/edges/visibility.ts
index f8559bd4..5cd684eb 100644
--- a/internal/stores/data_style/mesh/edges/visibility.ts
+++ b/internal/stores/data_style/mesh/edges/visibility.ts
@@ -7,24 +7,35 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.edges.visibility;
 
-export function useMeshEdgesVisibilityStyle() {
+export function useMeshEdgesVisibilityStyle(): {
+  meshEdgesVisibility: (id: string) => boolean | undefined;
+  setMeshEdgesVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
 
   function meshEdgesVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility is defined as boolean in the data style schema.
     return meshEdgesCommonStyle.meshEdgesStyle(id).visibility as boolean | undefined;
   }
-  function setMeshEdgesVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshEdgesVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => meshEdgesCommonStyle.mutateMeshEdgesStyle(id, { visibility }),
+        response_function: async () => {
+          const mutateResult = await meshEdgesCommonStyle.mutateMeshEdgesStyle(id, { visibility });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/edges/width.ts b/internal/stores/data_style/mesh/edges/width.ts
index 3af2b6be..4b607a92 100644
--- a/internal/stores/data_style/mesh/edges/width.ts
+++ b/internal/stores/data_style/mesh/edges/width.ts
@@ -7,24 +7,32 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.edges.width;
 
-export function useMeshEdgesWidthStyle() {
+export function useMeshEdgesWidthStyle(): {
+  meshEdgesWidth: (id: string) => number | undefined;
+  setMeshEdgesWidth: (id: string, width: number | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshEdgesCommonStyle = useMeshEdgesCommonStyle();
 
   function meshEdgesWidth(id: string): number | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- width is defined as number in the data style schema.
     return meshEdgesCommonStyle.meshEdgesStyle(id).width as number | undefined;
   }
-  function setMeshEdgesWidth(id: string, width: number | undefined) {
+  async function setMeshEdgesWidth(id: string, width: number | undefined): Promise<unknown> {
     const params = { id, width };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => meshEdgesCommonStyle.mutateMeshEdgesStyle(id, { width }),
+        response_function: async () => {
+          const mutateResult = await meshEdgesCommonStyle.mutateMeshEdgesStyle(id, { width });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/index.ts b/internal/stores/data_style/mesh/index.ts
index ba66e75e..991b0979 100644
--- a/internal/stores/data_style/mesh/index.ts
+++ b/internal/stores/data_style/mesh/index.ts
@@ -16,7 +16,17 @@ import { useMeshPolyhedraStyle } from "./polyhedra";
 const meshSchemas = viewer_schemas.opengeodeweb_viewer.mesh;
 
 // oxlint-disable-next-line max-lines-per-function
-export function useMeshStyle() {
+export function useMeshStyle(): {
+  meshVisibility: (id: string) => boolean | undefined;
+  setMeshVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+  meshColor: (id: string) => unknown;
+  setMeshColor: (id: string, color: unknown) => Promise<unknown>;
+  applyMeshStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshPointsStyle> &
+  ReturnType<typeof useMeshEdgesStyle> &
+  ReturnType<typeof useMeshCellsStyle> &
+  ReturnType<typeof useMeshPolygonsStyle> &
+  ReturnType<typeof useMeshPolyhedraStyle> {
   const hybridViewerStore = useHybridViewerStore();
   const viewerStore = useViewerStore();
   const dataStyleState = useDataStyleState();
@@ -29,47 +39,55 @@ export function useMeshStyle() {
   function meshVisibility(id: string): boolean | undefined {
     return dataStyleState.getStyle(id).visibility;
   }
-  function setMeshVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshVisibility(id: string, visibility: boolean | undefined): Promise<unknown> {
     const schema = meshSchemas.visibility;
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
         response_function: async () => {
-          await hybridViewerStore.setVisibility(id, visibility as boolean);
-          return dataStyleState.mutateStyle(id, { visibility });
+          if (visibility !== undefined) {
+            hybridViewerStore.setVisibility(id, visibility);
+          }
+          const mutatedId = await dataStyleState.mutateStyle(id, { visibility });
+          return mutatedId;
         },
       },
     );
+    return result;
   }
 
   function meshColor(id: string): unknown {
     return dataStyleState.getStyle(id).color;
   }
 
-  function setMeshColor(id: string, color: unknown) {
+  async function setMeshColor(id: string, color: unknown): Promise<unknown> {
     const schema = meshSchemas.color;
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => dataStyleState.mutateStyle(id, { color }),
+        response_function: async () => {
+          const mutatedId = await dataStyleState.mutateStyle(id, { color });
+          return mutatedId;
+        },
       },
     );
+    return result;
   }
 
-  function applyMeshStyle(id: string) {
+  async function applyMeshStyle(id: string): Promise<unknown[]> {
     const style = dataStyleState.getStyle(id);
     const promise_array: unknown[] = [];
     for (const [key, value] of Object.entries(style)) {
       if (key === "visibility") {
-        promise_array.push(setMeshVisibility(id, value as boolean | undefined));
+        promise_array.push(setMeshVisibility(id, style.visibility));
       } else if (key === "color") {
         promise_array.push(setMeshColor(id, value));
       } else if (key === "points") {
@@ -96,7 +114,8 @@ export function useMeshStyle() {
         throw new Error(`Unknown mesh key: ${key}`);
       }
     }
-    return Promise.all(promise_array);
+    const results = await Promise.all(promise_array);
+    return results;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/points/color.ts b/internal/stores/data_style/mesh/points/color.ts
index 33ee2774..2bd2576b 100644
--- a/internal/stores/data_style/mesh/points/color.ts
+++ b/internal/stores/data_style/mesh/points/color.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.points.color;
 
-export function useMeshPointsColorStyle() {
+export function useMeshPointsColorStyle(): {
+  meshPointsColor: (id: string) => unknown;
+  setMeshPointsColor: (id: string, color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPointsCommonStyle = useMeshPointsCommonStyle();
 
   function meshPointsColor(id: string): unknown {
     return meshPointsCommonStyle.meshPointsColoring(id).constant;
   }
-  function setMeshPointsColor(id: string, color: unknown) {
+  async function setMeshPointsColor(id: string, color: unknown): Promise<unknown> {
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPointsCommonStyle.mutateMeshPointsColoring(id, {
+        response_function: async () => {
+          const mutateResult = await meshPointsCommonStyle.mutateMeshPointsColoring(id, {
             constant: color,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/points/common.ts b/internal/stores/data_style/mesh/points/common.ts
index e4812a87..ebe1f07a 100644
--- a/internal/stores/data_style/mesh/points/common.ts
+++ b/internal/stores/data_style/mesh/points/common.ts
@@ -1,31 +1,45 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useMeshPointsCommonStyle() {
+export function useMeshPointsCommonStyle(): {
+  meshPointsStyle: (id: string) => StyleValues;
+  meshPointsColoring: (id: string) => StyleValues;
+  mutateMeshPointsColoring: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshPointsStyle: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshPointsVisibility: (
+    response: Readonly<{ id: string; visibility: boolean }>,
+  ) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateMeshPointsStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateMeshPointsStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       points: values,
     });
+    return result;
   }
 
-  function mutateMeshPointsVisibility(response: { id: string; visibility: boolean }) {
-    return mutateMeshPointsStyle(response.id, { visibility: response.visibility });
+  async function mutateMeshPointsVisibility(
+    response: Readonly<{ id: string; visibility: boolean }>,
+  ): Promise<string> {
+    const result = await mutateMeshPointsStyle(response.id, { visibility: response.visibility });
+    return result;
   }
 
   function meshPointsStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).points as StyleValues;
+    return dataStyleState.getStyle(id).points ?? {};
   }
 
   function meshPointsColoring(id: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return meshPointsStyle(id).coloring as StyleValues;
   }
 
-  function mutateMeshPointsColoring(id: string, values: StyleValues) {
-    return mutateMeshPointsStyle(id, {
+  async function mutateMeshPointsColoring(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshPointsStyle(id, {
       coloring: values,
     });
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/points/index.ts b/internal/stores/data_style/mesh/points/index.ts
index 149f039b..89a7428e 100644
--- a/internal/stores/data_style/mesh/points/index.ts
+++ b/internal/stores/data_style/mesh/points/index.ts
@@ -2,6 +2,7 @@
 
 // Local imports
 import { isMeshPointsVertexAttributeValid, useMeshPointsVertexAttributeStyle } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useMeshPointsColorStyle } from "./color";
 import { useMeshPointsCommonStyle } from "./common";
 import { useMeshPointsSizeStyle } from "./size";
@@ -9,74 +10,124 @@ import { useMeshPointsVisibilityStyle } from "./visibility";
 
 // Local constants
 
-function useMeshPointsColoringStyle() {
+interface MeshPointsActiveColoringDeps {
+  readonly commonStyle: Readonly<ReturnType<typeof useMeshPointsCommonStyle>>;
+  readonly colorStyle: Readonly<ReturnType<typeof useMeshPointsColorStyle>>;
+  readonly vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPointsVertexAttributeStyle>>;
+}
+
+function handleMeshPointsVertexColoring(
+  id: string,
+  vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPointsVertexAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = vertexAttributeStyle.meshPointsVertexAttributeName(id);
+  const item = vertexAttributeStyle.meshPointsVertexAttributeItem(id);
+  const [minimum, maximum] = vertexAttributeStyle.meshPointsVertexAttributeRange(id);
+  const colorMap = vertexAttributeStyle.meshPointsVertexAttributeColorMap(id);
+  const vertex_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshPointsVertexAttributeValid(vertex_attribute)) {
+    return undefined;
+  }
+  return vertexAttributeStyle.setMeshPointsVertexAttribute(id, vertex_attribute);
+}
+
+async function setMeshPointsActiveColoring(
+  id: string,
+  type: string | undefined,
+  deps: Readonly<MeshPointsActiveColoringDeps>,
+): Promise<unknown> {
+  await deps.commonStyle.mutateMeshPointsStyle(id, {
+    coloring: { active: type },
+  });
+  if (type === "constant") {
+    const result = await deps.colorStyle.setMeshPointsColor(
+      id,
+      deps.colorStyle.meshPointsColor(id),
+    );
+    return result;
+  }
+  if (type === "vertex") {
+    const result = await handleMeshPointsVertexColoring(id, deps.vertexAttributeStyle);
+    return result;
+  }
+  throw new Error(`Unknown mesh points coloring type: ${type}`);
+}
+
+async function applyMeshPointsStyle(
+  id: string,
+  visibilityStyle: Readonly<ReturnType<typeof useMeshPointsVisibilityStyle>>,
+  sizeStyle: Readonly<ReturnType<typeof useMeshPointsSizeStyle>>,
+  activeColoringType: string | undefined,
+  deps: Readonly<MeshPointsActiveColoringDeps>,
+): Promise<unknown[]> {
+  const result = await Promise.all([
+    visibilityStyle.setMeshPointsVisibility(id, visibilityStyle.meshPointsVisibility(id)),
+    sizeStyle.setMeshPointsSize(id, sizeStyle.meshPointsSize(id)),
+    setMeshPointsActiveColoring(id, activeColoringType, deps),
+  ]);
+  return result;
+}
+
+type UseMeshPointsStyleReturn = ReturnType<typeof useMeshPointsCommonStyle> & {
+  meshPointsColoring: (id: string) => StyleValues;
+  meshPointsActiveColoring: (id: string) => string | undefined;
+  setMeshPointsActiveColoring: (id: string, type: string | undefined) => Promise<unknown>;
+  applyMeshPointsStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshPointsVisibilityStyle> &
+  ReturnType<typeof useMeshPointsColorStyle> &
+  ReturnType<typeof useMeshPointsSizeStyle> &
+  ReturnType<typeof useMeshPointsVertexAttributeStyle>;
+
+export function useMeshPointsStyle(): UseMeshPointsStyleReturn {
   const meshPointsCommonStyle = useMeshPointsCommonStyle();
+  const meshPointsVisibility = useMeshPointsVisibilityStyle();
   const meshPointsColorStyle = useMeshPointsColorStyle();
+  const meshPointsSizeStyle = useMeshPointsSizeStyle();
   const meshPointsVertexAttributeStyle = useMeshPointsVertexAttributeStyle();
 
-  function meshPointsColoring(id: string) {
+  const activeColoringDeps: MeshPointsActiveColoringDeps = {
+    commonStyle: meshPointsCommonStyle,
+    colorStyle: meshPointsColorStyle,
+    vertexAttributeStyle: meshPointsVertexAttributeStyle,
+  };
+
+  function meshPointsColoring(id: string): StyleValues {
     return meshPointsCommonStyle.meshPointsColoring(id);
   }
 
   function meshPointsActiveColoring(id: string): string | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.active is defined as string in the data style schema.
     return meshPointsColoring(id).active as string | undefined;
   }
 
-  async function setMeshPointsActiveColoring(id: string, type: string | undefined) {
-    await meshPointsCommonStyle.mutateMeshPointsStyle(id, {
-      coloring: { active: type },
-    });
-    if (type === "constant") {
-      return meshPointsColorStyle.setMeshPointsColor(id, meshPointsColorStyle.meshPointsColor(id));
-    }
-    if (type === "vertex") {
-      const name = meshPointsVertexAttributeStyle.meshPointsVertexAttributeName(id);
-      const item = meshPointsVertexAttributeStyle.meshPointsVertexAttributeItem(id);
-      const [minimum, maximum] = meshPointsVertexAttributeStyle.meshPointsVertexAttributeRange(id);
-      const colorMap = meshPointsVertexAttributeStyle.meshPointsVertexAttributeColorMap(id);
-      const vertex_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshPointsVertexAttributeValid(vertex_attribute)) {
-        return;
-      }
-      return meshPointsVertexAttributeStyle.setMeshPointsVertexAttribute(id, vertex_attribute);
-    }
-    throw new Error(`Unknown mesh points coloring type: ${type}`);
+  async function boundSetMeshPointsActiveColoring(
+    id: string,
+    type: string | undefined,
+  ): Promise<unknown> {
+    const result = await setMeshPointsActiveColoring(id, type, activeColoringDeps);
+    return result;
   }
 
-  return {
-    meshPointsColoring,
-    meshPointsActiveColoring,
-    setMeshPointsActiveColoring,
-    ...meshPointsColorStyle,
-    ...meshPointsVertexAttributeStyle,
-  };
-}
-
-export function useMeshPointsStyle() {
-  const meshPointsCommonStyle = useMeshPointsCommonStyle();
-  const meshPointsVisibility = useMeshPointsVisibilityStyle();
-  const meshPointsSizeStyle = useMeshPointsSizeStyle();
-  const meshPointsColoringStyle = useMeshPointsColoringStyle();
-
-  function applyMeshPointsStyle(id: string) {
-    return Promise.all([
-      meshPointsVisibility.setMeshPointsVisibility(
-        id,
-        meshPointsVisibility.meshPointsVisibility(id),
-      ),
-      meshPointsSizeStyle.setMeshPointsSize(id, meshPointsSizeStyle.meshPointsSize(id)),
-      meshPointsColoringStyle.setMeshPointsActiveColoring(
-        id,
-        meshPointsColoringStyle.meshPointsActiveColoring(id),
-      ),
-    ]);
+  async function boundApplyMeshPointsStyle(id: string): Promise<unknown[]> {
+    const result = await applyMeshPointsStyle(
+      id,
+      meshPointsVisibility,
+      meshPointsSizeStyle,
+      meshPointsActiveColoring(id),
+      activeColoringDeps,
+    );
+    return result;
   }
 
   return {
     ...meshPointsCommonStyle,
-    ...meshPointsColoringStyle,
-    applyMeshPointsStyle,
+    meshPointsColoring,
+    meshPointsActiveColoring,
+    setMeshPointsActiveColoring: boundSetMeshPointsActiveColoring,
+    applyMeshPointsStyle: boundApplyMeshPointsStyle,
     ...meshPointsVisibility,
+    ...meshPointsColorStyle,
     ...meshPointsSizeStyle,
+    ...meshPointsVertexAttributeStyle,
   };
 }
diff --git a/internal/stores/data_style/mesh/points/size.ts b/internal/stores/data_style/mesh/points/size.ts
index 617f4cee..5ae23eb3 100644
--- a/internal/stores/data_style/mesh/points/size.ts
+++ b/internal/stores/data_style/mesh/points/size.ts
@@ -8,24 +8,32 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.points.size;
 
-export function useMeshPointsSizeStyle() {
+export function useMeshPointsSizeStyle(): {
+  meshPointsSize: (id: string) => number | undefined;
+  setMeshPointsSize: (id: string, size: number | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPointsCommonStyle = useMeshPointsCommonStyle();
 
   function meshPointsSize(id: string): number | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- size is defined as number in the data style schema.
     return meshPointsCommonStyle.meshPointsStyle(id).size as number | undefined;
   }
-  function setMeshPointsSize(id: string, size: number | undefined) {
+  async function setMeshPointsSize(id: string, size: number | undefined): Promise<unknown> {
     const params = { id, size };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => meshPointsCommonStyle.mutateMeshPointsStyle(id, { size }),
+        response_function: async () => {
+          const mutateResult = await meshPointsCommonStyle.mutateMeshPointsStyle(id, { size });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/points/vertex.ts b/internal/stores/data_style/mesh/points/vertex.ts
index 53873321..c6fea03e 100644
--- a/internal/stores/data_style/mesh/points/vertex.ts
+++ b/internal/stores/data_style/mesh/points/vertex.ts
@@ -49,11 +49,38 @@ function isMeshPointsVertexAttributeValid({
   );
 }
 
+interface UseMeshPointsVertexAttributeStyleReturn {
+  meshPointsVertexAttributeName: (id: string) => string | undefined;
+  meshPointsVertexAttributeItem: (id: string) => number;
+  meshPointsVertexAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshPointsVertexAttributeColorMap: (id: string) => string | undefined;
+  meshPointsVertexAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshPointsVertexAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshPointsVertexAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshPointsVertexAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshPointsVertexAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshPointsVertexAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshPointsVertexAttributeNoDataColor: (id: string) => unknown;
+  setMeshPointsVertexAttributeNoDataColor: (id: string, no_data_color: unknown) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useMeshPointsVertexAttributeStyle() {
+function useMeshPointsVertexAttributeStyle(): UseMeshPointsVertexAttributeStyleReturn {
   const viewerStore = useViewerStore();
   const meshPointsCommonStyle = useMeshPointsCommonStyle();
   function meshPointsVertexAttribute(id: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
     return meshPointsCommonStyle.meshPointsColoring(id).vertex as AttributeState;
   }
   function meshPointsVertexAttributeStoredConfig(
@@ -62,14 +89,10 @@ function useMeshPointsVertexAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshPointsVertexAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -78,35 +101,41 @@ function useMeshPointsVertexAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshPointsVertexStyle(id: string, values: Record<string, unknown>) {
-    return meshPointsCommonStyle.mutateMeshPointsStyle(id, {
+  async function mutateMeshPointsVertexStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshPointsCommonStyle.mutateMeshPointsStyle(id, {
       coloring: {
         vertex: values,
       },
     });
+    return result;
   }
-  function setMeshPointsVertexAttributeStoredConfig(
+  async function setMeshPointsVertexAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshPointsVertexStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshPointsVertexStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshPointsVertexAttributeName(id: string): string | undefined {
     return meshPointsVertexAttribute(id).name;
   }
   function meshPointsVertexAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshPointsVertexAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -114,7 +143,7 @@ function useMeshPointsVertexAttributeStyle() {
     const { item, name } = meshPointsVertexAttribute(id);
     return item ?? meshPointsVertexAttributeLastItem(id, name);
   }
-  function setMeshPointsVertexAttribute(
+  async function setMeshPointsVertexAttribute(
     id: string,
     {
       name,
@@ -124,18 +153,18 @@ function useMeshPointsVertexAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshPointsVertexStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshPointsVertexStyle(id, {
       name,
       item,
     });
-    setMeshPointsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPointsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshPointsVertexAttributeSchemas.attribute;
     const params = {
       id,
@@ -151,7 +180,7 @@ function useMeshPointsVertexAttributeStyle() {
       params,
     });
   }
-  function applyVertexAttribute(id: string) {
+  async function applyVertexAttribute(id: string): Promise<unknown> {
     const name = meshPointsVertexAttributeName(id);
     const item = meshPointsVertexAttributeItem(id);
     const storedConfig = meshPointsVertexAttributeStoredConfig(id, name, item);
@@ -164,19 +193,21 @@ function useMeshPointsVertexAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshPointsVertexAttributeValid(attribute)) {
-      return setMeshPointsVertexAttribute(id, attribute);
+      const result = await setMeshPointsVertexAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshPointsVertexAttributeName(id: string, name: string) {
+  async function setMeshPointsVertexAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshPointsVertexAttributeLastItem(id, name);
-    mutateMeshPointsVertexStyle(id, {
+    await mutateMeshPointsVertexStyle(id, {
       name,
       item,
     });
     return applyVertexAttribute(id);
   }
-  function setMeshPointsVertexAttributeItem(id: string, item: number) {
-    mutateMeshPointsVertexStyle(id, {
+  async function setMeshPointsVertexAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshPointsVertexStyle(id, {
       item,
     });
     return applyVertexAttribute(id);
@@ -187,10 +218,14 @@ function useMeshPointsVertexAttributeStyle() {
     const storedConfig = meshPointsVertexAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshPointsVertexAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshPointsVertexAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshPointsVertexAttributeName(id);
     const item = meshPointsVertexAttributeItem(id);
-    setMeshPointsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPointsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -202,10 +237,13 @@ function useMeshPointsVertexAttributeStyle() {
     const storedConfig = meshPointsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshPointsVertexAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshPointsVertexAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshPointsVertexAttributeName(id);
     const item = meshPointsVertexAttributeItem(id);
-    setMeshPointsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPointsVertexAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyVertexAttribute(id);
@@ -216,7 +254,10 @@ function useMeshPointsVertexAttributeStyle() {
     const storedConfig = meshPointsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshPointsVertexAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshPointsVertexAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshPointsVertexAttributeName(id);
     const item = meshPointsVertexAttributeItem(id);
     const storedConfig = meshPointsVertexAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/points/visibility.ts b/internal/stores/data_style/mesh/points/visibility.ts
index 14c3314d..21af328e 100644
--- a/internal/stores/data_style/mesh/points/visibility.ts
+++ b/internal/stores/data_style/mesh/points/visibility.ts
@@ -8,28 +8,38 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.points.visibility;
 
-export function useMeshPointsVisibilityStyle() {
+export function useMeshPointsVisibilityStyle(): {
+  meshPointsVisibility: (id: string) => boolean | undefined;
+  setMeshPointsVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPointsCommonStyle = useMeshPointsCommonStyle();
 
   function meshPointsVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility is defined as boolean in the data style schema.
     return meshPointsCommonStyle.meshPointsStyle(id).visibility as boolean | undefined;
   }
-  function setMeshPointsVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshPointsVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function(response: unknown) {
-          return meshPointsCommonStyle.mutateMeshPointsVisibility(
-            response as { id: string; visibility: boolean },
-          );
+        response_function: async (response: unknown) => {
+          // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the viewer schema.
+          const typedResponse = response as { id: string; visibility: boolean };
+          const mutateResult =
+            await meshPointsCommonStyle.mutateMeshPointsVisibility(typedResponse);
+          return mutateResult;
         },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polygons/color.ts b/internal/stores/data_style/mesh/polygons/color.ts
index 059121b4..92b70bb9 100644
--- a/internal/stores/data_style/mesh/polygons/color.ts
+++ b/internal/stores/data_style/mesh/polygons/color.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.polygons.color;
 
-export function useMeshPolygonsColorStyle() {
+export function useMeshPolygonsColorStyle(): {
+  meshPolygonsColor: (id: string) => unknown;
+  setMeshPolygonsColor: (id: string, color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
 
   function meshPolygonsColor(id: string): unknown {
     return meshPolygonsCommonStyle.meshPolygonsColoring(id).constant;
   }
-  function setMeshPolygonsColor(id: string, color: unknown) {
+  async function setMeshPolygonsColor(id: string, color: unknown): Promise<unknown> {
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPolygonsCommonStyle.mutateMeshPolygonsColoring(id, {
+        response_function: async () => {
+          const mutateResult = await meshPolygonsCommonStyle.mutateMeshPolygonsColoring(id, {
             constant: color,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polygons/common.ts b/internal/stores/data_style/mesh/polygons/common.ts
index 05dda694..df610f90 100644
--- a/internal/stores/data_style/mesh/polygons/common.ts
+++ b/internal/stores/data_style/mesh/polygons/common.ts
@@ -1,27 +1,43 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useMeshPolygonsCommonStyle() {
+export function useMeshPolygonsCommonStyle(): {
+  meshPolygonsStyle: (id: string) => StyleValues;
+  meshPolygonsColoring: (id: string) => StyleValues;
+  mutateMeshPolygonsStyle: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshPolygonsColoring: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshPolygonsPolygonStyle: (id: string, values: StyleValues) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateMeshPolygonsStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateMeshPolygonsStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       polygons: values,
     });
+    return result;
   }
 
   function meshPolygonsStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).polygons as StyleValues;
+    return dataStyleState.getStyle(id).polygons ?? {};
   }
 
   function meshPolygonsColoring(id: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return meshPolygonsStyle(id).coloring as StyleValues;
   }
 
-  function mutateMeshPolygonsColoring(id: string, values: StyleValues) {
-    return mutateMeshPolygonsStyle(id, {
+  async function mutateMeshPolygonsColoring(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshPolygonsStyle(id, {
       coloring: values,
     });
+    return result;
+  }
+
+  async function mutateMeshPolygonsPolygonStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshPolygonsColoring(id, {
+      polygon: values,
+    });
+    return result;
   }
 
   return {
@@ -29,5 +45,6 @@ export function useMeshPolygonsCommonStyle() {
     meshPolygonsColoring,
     mutateMeshPolygonsStyle,
     mutateMeshPolygonsColoring,
+    mutateMeshPolygonsPolygonStyle,
   };
 }
diff --git a/internal/stores/data_style/mesh/polygons/index.ts b/internal/stores/data_style/mesh/polygons/index.ts
index ffdd25de..ed0cee3c 100644
--- a/internal/stores/data_style/mesh/polygons/index.ts
+++ b/internal/stores/data_style/mesh/polygons/index.ts
@@ -6,6 +6,7 @@ import {
   useMeshPolygonsPolygonAttributeStyle,
 } from "./polygon";
 import { isMeshPolygonsVertexAttributeValid, useMeshPolygonsVertexAttributeStyle } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useMeshPolygonsColorStyle } from "./color";
 import { useMeshPolygonsCommonStyle } from "./common";
 import { useMeshPolygonsTexturesStyle } from "./textures";
@@ -13,95 +14,154 @@ import { useMeshPolygonsVisibilityStyle } from "./visibility";
 
 // Local constants
 
-function useMeshPolygonsColoringStyle() {
+interface MeshPolygonsActiveColoringDeps {
+  readonly commonStyle: Readonly<ReturnType<typeof useMeshPolygonsCommonStyle>>;
+  readonly colorStyle: Readonly<ReturnType<typeof useMeshPolygonsColorStyle>>;
+  readonly texturesStyle: Readonly<ReturnType<typeof useMeshPolygonsTexturesStyle>>;
+  readonly vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPolygonsVertexAttributeStyle>>;
+  readonly polygonAttributeStyle: Readonly<ReturnType<typeof useMeshPolygonsPolygonAttributeStyle>>;
+}
+
+function handleMeshPolygonsVertexColoring(
+  id: string,
+  vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPolygonsVertexAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = vertexAttributeStyle.meshPolygonsVertexAttributeName(id);
+  const item = vertexAttributeStyle.meshPolygonsVertexAttributeItem(id);
+  const [minimum, maximum] = vertexAttributeStyle.meshPolygonsVertexAttributeRange(id);
+  const colorMap = vertexAttributeStyle.meshPolygonsVertexAttributeColorMap(id);
+  const vertex_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshPolygonsVertexAttributeValid(vertex_attribute)) {
+    return undefined;
+  }
+  return vertexAttributeStyle.setMeshPolygonsVertexAttribute(id, vertex_attribute);
+}
+
+function handleMeshPolygonsPolygonColoring(
+  id: string,
+  polygonAttributeStyle: Readonly<ReturnType<typeof useMeshPolygonsPolygonAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = polygonAttributeStyle.meshPolygonsPolygonAttributeName(id);
+  const item = polygonAttributeStyle.meshPolygonsPolygonAttributeItem(id);
+  const [minimum, maximum] = polygonAttributeStyle.meshPolygonsPolygonAttributeRange(id);
+  const colorMap = polygonAttributeStyle.meshPolygonsPolygonAttributeColorMap(id);
+  const polygon_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshPolygonsPolygonAttributeValid(polygon_attribute)) {
+    return undefined;
+  }
+  return polygonAttributeStyle.setMeshPolygonsPolygonAttribute(id, polygon_attribute);
+}
+
+async function setMeshPolygonsActiveColoring(
+  id: string,
+  type: string | undefined,
+  deps: Readonly<MeshPolygonsActiveColoringDeps>,
+): Promise<unknown> {
+  await deps.commonStyle.mutateMeshPolygonsStyle(id, {
+    coloring: { active: type },
+  });
+  if (type === "constant") {
+    const result = await deps.colorStyle.setMeshPolygonsColor(
+      id,
+      deps.colorStyle.meshPolygonsColor(id),
+    );
+    return result;
+  }
+  if (type === "textures") {
+    const result = await deps.texturesStyle.setMeshPolygonsTextures(
+      id,
+      deps.texturesStyle.meshPolygonsTextures(id),
+    );
+    return result;
+  }
+  if (type === "vertex") {
+    const result = await handleMeshPolygonsVertexColoring(id, deps.vertexAttributeStyle);
+    return result;
+  }
+  if (type === "polygon") {
+    const result = await handleMeshPolygonsPolygonColoring(id, deps.polygonAttributeStyle);
+    return result;
+  }
+  throw new Error(`Unknown mesh polygons coloring type: ${type}`);
+}
+
+async function applyMeshPolygonsStyle(
+  id: string,
+  visibilityStyle: Readonly<ReturnType<typeof useMeshPolygonsVisibilityStyle>>,
+  activeColoringType: string | undefined,
+  deps: Readonly<MeshPolygonsActiveColoringDeps>,
+): Promise<unknown[]> {
+  const result = await Promise.all([
+    visibilityStyle.setMeshPolygonsVisibility(id, visibilityStyle.meshPolygonsVisibility(id)),
+    setMeshPolygonsActiveColoring(id, activeColoringType, deps),
+  ]);
+  return result;
+}
+
+type UseMeshPolygonsStyleReturn = ReturnType<typeof useMeshPolygonsCommonStyle> & {
+  meshPolygonsColoring: (id: string) => StyleValues;
+  meshPolygonsActiveColoring: (id: string) => string | undefined;
+  setMeshPolygonsActiveColoring: (id: string, type: string | undefined) => Promise<unknown>;
+  applyMeshPolygonsStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshPolygonsVisibilityStyle> &
+  ReturnType<typeof useMeshPolygonsColorStyle> &
+  ReturnType<typeof useMeshPolygonsTexturesStyle> &
+  ReturnType<typeof useMeshPolygonsVertexAttributeStyle> &
+  ReturnType<typeof useMeshPolygonsPolygonAttributeStyle>;
+
+export function useMeshPolygonsStyle(): UseMeshPolygonsStyleReturn {
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
+  const meshPolygonsVisibility = useMeshPolygonsVisibilityStyle();
   const meshPolygonsColorStyle = useMeshPolygonsColorStyle();
-  const meshPolygonsTexturesStyle = useMeshPolygonsTexturesStyle();
+  const meshPolygonsTexturesStore = useMeshPolygonsTexturesStyle();
   const meshPolygonsVertexAttributeStyle = useMeshPolygonsVertexAttributeStyle();
   const meshPolygonsPolygonAttributeStyle = useMeshPolygonsPolygonAttributeStyle();
 
-  function meshPolygonsColoring(id: string) {
+  const activeColoringDeps: MeshPolygonsActiveColoringDeps = {
+    commonStyle: meshPolygonsCommonStyle,
+    colorStyle: meshPolygonsColorStyle,
+    texturesStyle: meshPolygonsTexturesStore,
+    vertexAttributeStyle: meshPolygonsVertexAttributeStyle,
+    polygonAttributeStyle: meshPolygonsPolygonAttributeStyle,
+  };
+
+  function meshPolygonsColoring(id: string): StyleValues {
     return meshPolygonsCommonStyle.meshPolygonsColoring(id);
   }
 
   function meshPolygonsActiveColoring(id: string): string | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.active is defined as string in the data style schema.
     return meshPolygonsColoring(id).active as string | undefined;
   }
 
-  async function setMeshPolygonsActiveColoring(id: string, type: string | undefined) {
-    await meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
-      coloring: { active: type },
-    });
-    if (type === "constant") {
-      return meshPolygonsColorStyle.setMeshPolygonsColor(
-        id,
-        meshPolygonsColorStyle.meshPolygonsColor(id),
-      );
-    }
-    if (type === "textures") {
-      const textures = meshPolygonsTexturesStyle.meshPolygonsTextures(id);
-      return meshPolygonsTexturesStyle.setMeshPolygonsTextures(id, textures);
-    }
-    if (type === "vertex") {
-      const name = meshPolygonsVertexAttributeStyle.meshPolygonsVertexAttributeName(id);
-      const item = meshPolygonsVertexAttributeStyle.meshPolygonsVertexAttributeItem(id);
-      const [minimum, maximum] =
-        meshPolygonsVertexAttributeStyle.meshPolygonsVertexAttributeRange(id);
-      const colorMap = meshPolygonsVertexAttributeStyle.meshPolygonsVertexAttributeColorMap(id);
-      const vertex_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshPolygonsVertexAttributeValid(vertex_attribute)) {
-        return;
-      }
-      return meshPolygonsVertexAttributeStyle.setMeshPolygonsVertexAttribute(id, vertex_attribute);
-    }
-    if (type === "polygon") {
-      const name = meshPolygonsPolygonAttributeStyle.meshPolygonsPolygonAttributeName(id);
-      const item = meshPolygonsPolygonAttributeStyle.meshPolygonsPolygonAttributeItem(id);
-      const [minimum, maximum] =
-        meshPolygonsPolygonAttributeStyle.meshPolygonsPolygonAttributeRange(id);
-      const colorMap = meshPolygonsPolygonAttributeStyle.meshPolygonsPolygonAttributeColorMap(id);
-      const polygon_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshPolygonsPolygonAttributeValid(polygon_attribute)) {
-        return;
-      }
-      return meshPolygonsPolygonAttributeStyle.setMeshPolygonsPolygonAttribute(
-        id,
-        polygon_attribute,
-      );
-    }
-    throw new Error(`Unknown mesh polygons coloring type: ${type}`);
+  async function boundSetMeshPolygonsActiveColoring(
+    id: string,
+    type: string | undefined,
+  ): Promise<unknown> {
+    const result = await setMeshPolygonsActiveColoring(id, type, activeColoringDeps);
+    return result;
+  }
+
+  async function boundApplyMeshPolygonsStyle(id: string): Promise<unknown[]> {
+    const result = await applyMeshPolygonsStyle(
+      id,
+      meshPolygonsVisibility,
+      meshPolygonsActiveColoring(id),
+      activeColoringDeps,
+    );
+    return result;
   }
 
   return {
+    ...meshPolygonsCommonStyle,
     meshPolygonsColoring,
     meshPolygonsActiveColoring,
-    setMeshPolygonsActiveColoring,
+    setMeshPolygonsActiveColoring: boundSetMeshPolygonsActiveColoring,
+    applyMeshPolygonsStyle: boundApplyMeshPolygonsStyle,
+    ...meshPolygonsVisibility,
     ...meshPolygonsColorStyle,
-    ...meshPolygonsTexturesStyle,
+    ...meshPolygonsTexturesStore,
     ...meshPolygonsVertexAttributeStyle,
     ...meshPolygonsPolygonAttributeStyle,
   };
 }
-
-export function useMeshPolygonsStyle() {
-  const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
-  const meshPolygonsVisibility = useMeshPolygonsVisibilityStyle();
-  const coloringStyle = useMeshPolygonsColoringStyle();
-
-  function applyMeshPolygonsStyle(id: string) {
-    return Promise.all([
-      meshPolygonsVisibility.setMeshPolygonsVisibility(
-        id,
-        meshPolygonsVisibility.meshPolygonsVisibility(id),
-      ),
-      coloringStyle.setMeshPolygonsActiveColoring(id, coloringStyle.meshPolygonsActiveColoring(id)),
-    ]);
-  }
-
-  return {
-    ...meshPolygonsCommonStyle,
-    ...coloringStyle,
-    applyMeshPolygonsStyle,
-    ...meshPolygonsVisibility,
-  };
-}
diff --git a/internal/stores/data_style/mesh/polygons/polygon.ts b/internal/stores/data_style/mesh/polygons/polygon.ts
index e91ab8b5..a72aa630 100644
--- a/internal/stores/data_style/mesh/polygons/polygon.ts
+++ b/internal/stores/data_style/mesh/polygons/polygon.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshPolygonsCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -51,14 +50,39 @@ function isMeshPolygonsPolygonAttributeValid({
 }
 
 // oxlint-disable-next-line max-lines-per-function
-function useMeshPolygonsPolygonAttributeStyle() {
+function useMeshPolygonsPolygonAttributeStyle(): {
+  meshPolygonsPolygonAttributeName: (id: string) => string | undefined;
+  meshPolygonsPolygonAttributeItem: (id: string) => number;
+  meshPolygonsPolygonAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshPolygonsPolygonAttributeColorMap: (id: string) => string | undefined;
+  meshPolygonsPolygonAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshPolygonsPolygonAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshPolygonsPolygonAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshPolygonsPolygonAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshPolygonsPolygonAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshPolygonsPolygonAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshPolygonsPolygonAttributeNoDataColor: (id: string) => unknown;
+  setMeshPolygonsPolygonAttributeNoDataColor: (
+    id: string,
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
-  function meshPolygonsColoring(id: string): StyleValues {
-    return meshPolygonsCommonStyle.meshPolygonsStyle(id).coloring as StyleValues;
-  }
   function meshPolygonsPolygonAttribute(id: string): AttributeState {
-    return meshPolygonsColoring(id).polygon as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.polygon shape is defined by the data style schema.
+    return meshPolygonsCommonStyle.meshPolygonsColoring(id).polygon as AttributeState;
   }
   function meshPolygonsPolygonAttributeStoredConfig(
     id: string,
@@ -66,14 +90,10 @@ function useMeshPolygonsPolygonAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshPolygonsPolygonAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,35 +102,37 @@ function useMeshPolygonsPolygonAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshPolygonsPolygonStyle(id: string, values: Record<string, unknown>) {
-    return meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
-      coloring: {
-        polygon: values,
-      },
-    });
+  async function mutateMeshPolygonsPolygonStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshPolygonsCommonStyle.mutateMeshPolygonsPolygonStyle(id, values);
+    return result;
   }
-  function setMeshPolygonsPolygonAttributeStoredConfig(
+  async function setMeshPolygonsPolygonAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshPolygonsPolygonStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshPolygonsPolygonStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshPolygonsPolygonAttributeName(id: string): string | undefined {
     return meshPolygonsPolygonAttribute(id).name;
   }
   function meshPolygonsPolygonAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshPolygonsPolygonAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -118,7 +140,7 @@ function useMeshPolygonsPolygonAttributeStyle() {
     const { item, name } = meshPolygonsPolygonAttribute(id);
     return item ?? meshPolygonsPolygonAttributeLastItem(id, name);
   }
-  function setMeshPolygonsPolygonAttribute(
+  async function setMeshPolygonsPolygonAttribute(
     id: string,
     {
       name,
@@ -128,18 +150,18 @@ function useMeshPolygonsPolygonAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshPolygonsPolygonStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshPolygonsPolygonStyle(id, {
       name,
       item,
     });
-    setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshPolygonsPolygonAttributeSchemas.attribute;
     const params = {
       id,
@@ -155,7 +177,7 @@ function useMeshPolygonsPolygonAttributeStyle() {
       params,
     });
   }
-  function applyPolygonAttribute(id: string) {
+  async function applyPolygonAttribute(id: string): Promise<unknown> {
     const name = meshPolygonsPolygonAttributeName(id);
     const item = meshPolygonsPolygonAttributeItem(id);
     const storedConfig = meshPolygonsPolygonAttributeStoredConfig(id, name, item);
@@ -168,19 +190,21 @@ function useMeshPolygonsPolygonAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshPolygonsPolygonAttributeValid(attribute)) {
-      return setMeshPolygonsPolygonAttribute(id, attribute);
+      const result = await setMeshPolygonsPolygonAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshPolygonsPolygonAttributeName(id: string, name: string) {
+  async function setMeshPolygonsPolygonAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshPolygonsPolygonAttributeLastItem(id, name);
-    mutateMeshPolygonsPolygonStyle(id, {
+    await mutateMeshPolygonsPolygonStyle(id, {
       name,
       item,
     });
     return applyPolygonAttribute(id);
   }
-  function setMeshPolygonsPolygonAttributeItem(id: string, item: number) {
-    mutateMeshPolygonsPolygonStyle(id, {
+  async function setMeshPolygonsPolygonAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshPolygonsPolygonStyle(id, {
       item,
     });
     return applyPolygonAttribute(id);
@@ -191,10 +215,14 @@ function useMeshPolygonsPolygonAttributeStyle() {
     const storedConfig = meshPolygonsPolygonAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshPolygonsPolygonAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshPolygonsPolygonAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshPolygonsPolygonAttributeName(id);
     const item = meshPolygonsPolygonAttributeItem(id);
-    setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -206,10 +234,13 @@ function useMeshPolygonsPolygonAttributeStyle() {
     const storedConfig = meshPolygonsPolygonAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshPolygonsPolygonAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshPolygonsPolygonAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshPolygonsPolygonAttributeName(id);
     const item = meshPolygonsPolygonAttributeItem(id);
-    setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsPolygonAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyPolygonAttribute(id);
@@ -220,7 +251,10 @@ function useMeshPolygonsPolygonAttributeStyle() {
     const storedConfig = meshPolygonsPolygonAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshPolygonsPolygonAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshPolygonsPolygonAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshPolygonsPolygonAttributeName(id);
     const item = meshPolygonsPolygonAttributeItem(id);
     const storedConfig = meshPolygonsPolygonAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/polygons/textures.ts b/internal/stores/data_style/mesh/polygons/textures.ts
index 5e0c6c9c..6eb85e00 100644
--- a/internal/stores/data_style/mesh/polygons/textures.ts
+++ b/internal/stores/data_style/mesh/polygons/textures.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.apply_textures;
 
-export function useMeshPolygonsTexturesStyle() {
+export function useMeshPolygonsTexturesStyle(): {
+  meshPolygonsTextures: (id: string) => unknown;
+  setMeshPolygonsTextures: (id: string, textures: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
 
   function meshPolygonsTextures(id: string): unknown {
     return meshPolygonsCommonStyle.meshPolygonsColoring(id).textures;
   }
-  function setMeshPolygonsTextures(id: string, textures: unknown) {
+  async function setMeshPolygonsTextures(id: string, textures: unknown): Promise<unknown> {
     const params = { id, textures };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
+        response_function: async () => {
+          const mutateResult = await meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
             coloring: { textures },
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polygons/vertex.ts b/internal/stores/data_style/mesh/polygons/vertex.ts
index f8097128..32b884a0 100644
--- a/internal/stores/data_style/mesh/polygons/vertex.ts
+++ b/internal/stores/data_style/mesh/polygons/vertex.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshPolygonsCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -50,15 +49,42 @@ function isMeshPolygonsVertexAttributeValid({
   );
 }
 
+interface UseMeshPolygonsVertexAttributeStyleReturn {
+  meshPolygonsVertexAttributeName: (id: string) => string | undefined;
+  meshPolygonsVertexAttributeItem: (id: string) => number;
+  meshPolygonsVertexAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshPolygonsVertexAttributeColorMap: (id: string) => string | undefined;
+  meshPolygonsVertexAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshPolygonsVertexAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshPolygonsVertexAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshPolygonsVertexAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshPolygonsVertexAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshPolygonsVertexAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshPolygonsVertexAttributeNoDataColor: (id: string) => unknown;
+  setMeshPolygonsVertexAttributeNoDataColor: (
+    id: string,
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useMeshPolygonsVertexAttributeStyle() {
+function useMeshPolygonsVertexAttributeStyle(): UseMeshPolygonsVertexAttributeStyleReturn {
   const viewerStore = useViewerStore();
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
-  function meshPolygonsColoring(id: string): StyleValues {
-    return meshPolygonsCommonStyle.meshPolygonsStyle(id).coloring as StyleValues;
-  }
   function meshPolygonsVertexAttribute(id: string): AttributeState {
-    return meshPolygonsColoring(id).vertex as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
+    return meshPolygonsCommonStyle.meshPolygonsColoring(id).vertex as AttributeState;
   }
   function meshPolygonsVertexAttributeStoredConfig(
     id: string,
@@ -66,14 +92,10 @@ function useMeshPolygonsVertexAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshPolygonsVertexAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,35 +104,41 @@ function useMeshPolygonsVertexAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshPolygonsVertexStyle(id: string, values: Record<string, unknown>) {
-    return meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
+  async function mutateMeshPolygonsVertexStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
       coloring: {
         vertex: values,
       },
     });
+    return result;
   }
-  function setMeshPolygonsVertexAttributeStoredConfig(
+  async function setMeshPolygonsVertexAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshPolygonsVertexStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshPolygonsVertexStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshPolygonsVertexAttributeName(id: string): string | undefined {
     return meshPolygonsVertexAttribute(id).name;
   }
   function meshPolygonsVertexAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshPolygonsVertexAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -118,7 +146,7 @@ function useMeshPolygonsVertexAttributeStyle() {
     const { item, name } = meshPolygonsVertexAttribute(id);
     return item ?? meshPolygonsVertexAttributeLastItem(id, name);
   }
-  function setMeshPolygonsVertexAttribute(
+  async function setMeshPolygonsVertexAttribute(
     id: string,
     {
       name,
@@ -128,18 +156,18 @@ function useMeshPolygonsVertexAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshPolygonsVertexStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshPolygonsVertexStyle(id, {
       name,
       item,
     });
-    setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshPolygonsVertexAttributeSchemas.attribute;
     const params = {
       id,
@@ -155,7 +183,7 @@ function useMeshPolygonsVertexAttributeStyle() {
       params,
     });
   }
-  function applyVertexAttribute(id: string) {
+  async function applyVertexAttribute(id: string): Promise<unknown> {
     const name = meshPolygonsVertexAttributeName(id);
     const item = meshPolygonsVertexAttributeItem(id);
     const storedConfig = meshPolygonsVertexAttributeStoredConfig(id, name, item);
@@ -168,19 +196,21 @@ function useMeshPolygonsVertexAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshPolygonsVertexAttributeValid(attribute)) {
-      return setMeshPolygonsVertexAttribute(id, attribute);
+      const result = await setMeshPolygonsVertexAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshPolygonsVertexAttributeName(id: string, name: string) {
+  async function setMeshPolygonsVertexAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshPolygonsVertexAttributeLastItem(id, name);
-    mutateMeshPolygonsVertexStyle(id, {
+    await mutateMeshPolygonsVertexStyle(id, {
       name,
       item,
     });
     return applyVertexAttribute(id);
   }
-  function setMeshPolygonsVertexAttributeItem(id: string, item: number) {
-    mutateMeshPolygonsVertexStyle(id, {
+  async function setMeshPolygonsVertexAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshPolygonsVertexStyle(id, {
       item,
     });
     return applyVertexAttribute(id);
@@ -191,10 +221,14 @@ function useMeshPolygonsVertexAttributeStyle() {
     const storedConfig = meshPolygonsVertexAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshPolygonsVertexAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshPolygonsVertexAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshPolygonsVertexAttributeName(id);
     const item = meshPolygonsVertexAttributeItem(id);
-    setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -206,10 +240,13 @@ function useMeshPolygonsVertexAttributeStyle() {
     const storedConfig = meshPolygonsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshPolygonsVertexAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshPolygonsVertexAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshPolygonsVertexAttributeName(id);
     const item = meshPolygonsVertexAttributeItem(id);
-    setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolygonsVertexAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyVertexAttribute(id);
@@ -220,7 +257,10 @@ function useMeshPolygonsVertexAttributeStyle() {
     const storedConfig = meshPolygonsVertexAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshPolygonsVertexAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshPolygonsVertexAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshPolygonsVertexAttributeName(id);
     const item = meshPolygonsVertexAttributeItem(id);
     const storedConfig = meshPolygonsVertexAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/polygons/visibility.ts b/internal/stores/data_style/mesh/polygons/visibility.ts
index 1db4aa07..5fda1dfa 100644
--- a/internal/stores/data_style/mesh/polygons/visibility.ts
+++ b/internal/stores/data_style/mesh/polygons/visibility.ts
@@ -8,27 +8,37 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.polygons.visibility;
 
-export function useMeshPolygonsVisibilityStyle() {
+export function useMeshPolygonsVisibilityStyle(): {
+  meshPolygonsVisibility: (id: string) => boolean | undefined;
+  setMeshPolygonsVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolygonsCommonStyle = useMeshPolygonsCommonStyle();
 
   function meshPolygonsVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility is defined as boolean in the data style schema.
     return meshPolygonsCommonStyle.meshPolygonsStyle(id).visibility as boolean | undefined;
   }
-  function setMeshPolygonsVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshPolygonsVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
+        response_function: async () => {
+          const mutateResult = await meshPolygonsCommonStyle.mutateMeshPolygonsStyle(id, {
             visibility,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polyhedra/color.ts b/internal/stores/data_style/mesh/polyhedra/color.ts
index c791b63f..b811b796 100644
--- a/internal/stores/data_style/mesh/polyhedra/color.ts
+++ b/internal/stores/data_style/mesh/polyhedra/color.ts
@@ -8,27 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra.color;
 
-export function useMeshPolyhedraColorStyle() {
+export function useMeshPolyhedraColorStyle(): {
+  meshPolyhedraColor: (id: string) => unknown;
+  setMeshPolyhedraColor: (id: string, color: unknown) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolyhedraCommonStyle = useMeshPolyhedraCommonStyle();
 
   function meshPolyhedraColor(id: string): unknown {
     return meshPolyhedraCommonStyle.meshPolyhedraColoring(id).constant;
   }
-  function setMeshPolyhedraColor(id: string, color: unknown) {
+  async function setMeshPolyhedraColor(id: string, color: unknown): Promise<unknown> {
     const params = { id, color };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPolyhedraCommonStyle.mutateMeshPolyhedraColoring(id, {
+        response_function: async () => {
+          const mutation_result = await meshPolyhedraCommonStyle.mutateMeshPolyhedraColoring(id, {
             constant: color,
-          }),
+          });
+          return mutation_result;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polyhedra/common.ts b/internal/stores/data_style/mesh/polyhedra/common.ts
index d3242157..1e64f7dd 100644
--- a/internal/stores/data_style/mesh/polyhedra/common.ts
+++ b/internal/stores/data_style/mesh/polyhedra/common.ts
@@ -1,27 +1,35 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useMeshPolyhedraCommonStyle() {
+export function useMeshPolyhedraCommonStyle(): {
+  meshPolyhedraStyle: (id: string) => StyleValues;
+  meshPolyhedraColoring: (id: string) => StyleValues;
+  mutateMeshPolyhedraStyle: (id: string, values: StyleValues) => Promise<string>;
+  mutateMeshPolyhedraColoring: (id: string, values: StyleValues) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateMeshPolyhedraStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateMeshPolyhedraStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       polyhedra: values,
     });
+    return result;
   }
 
   function meshPolyhedraStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).polyhedra as StyleValues;
+    return dataStyleState.getStyle(id).polyhedra ?? {};
   }
 
   function meshPolyhedraColoring(id: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return meshPolyhedraStyle(id).coloring as StyleValues;
   }
 
-  function mutateMeshPolyhedraColoring(id: string, values: StyleValues) {
-    return mutateMeshPolyhedraStyle(id, {
+  async function mutateMeshPolyhedraColoring(id: string, values: StyleValues): Promise<string> {
+    const result = await mutateMeshPolyhedraStyle(id, {
       coloring: values,
     });
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/mesh/polyhedra/index.ts b/internal/stores/data_style/mesh/polyhedra/index.ts
index 10dc8917..de38c8ad 100644
--- a/internal/stores/data_style/mesh/polyhedra/index.ts
+++ b/internal/stores/data_style/mesh/polyhedra/index.ts
@@ -9,87 +9,148 @@ import {
   isMeshPolyhedraVertexAttributeValid,
   useMeshPolyhedraVertexAttributeStyle,
 } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useMeshPolyhedraColorStyle } from "./color";
 import { useMeshPolyhedraCommonStyle } from "./common";
 import { useMeshPolyhedraVisibilityStyle } from "./visibility";
 
 // Local constants
 
-export function useMeshPolyhedraStyle() {
+interface MeshPolyhedraActiveColoringDeps {
+  readonly commonStyle: Readonly<ReturnType<typeof useMeshPolyhedraCommonStyle>>;
+  readonly colorStyle: Readonly<ReturnType<typeof useMeshPolyhedraColorStyle>>;
+  readonly vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPolyhedraVertexAttributeStyle>>;
+  readonly polyhedronAttributeStyle: Readonly<
+    ReturnType<typeof useMeshPolyhedraPolyhedronAttributeStyle>
+  >;
+}
+
+function handleMeshPolyhedraVertexColoring(
+  id: string,
+  vertexAttributeStyle: Readonly<ReturnType<typeof useMeshPolyhedraVertexAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = vertexAttributeStyle.meshPolyhedraVertexAttributeName(id);
+  const item = vertexAttributeStyle.meshPolyhedraVertexAttributeItem(id);
+  const [minimum, maximum] = vertexAttributeStyle.meshPolyhedraVertexAttributeRange(id);
+  const colorMap = vertexAttributeStyle.meshPolyhedraVertexAttributeColorMap(id);
+  const vertex_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshPolyhedraVertexAttributeValid(vertex_attribute)) {
+    return undefined;
+  }
+  return vertexAttributeStyle.setMeshPolyhedraVertexAttribute(id, vertex_attribute);
+}
+
+function handleMeshPolyhedraPolyhedronColoring(
+  id: string,
+  polyhedronAttributeStyle: Readonly<ReturnType<typeof useMeshPolyhedraPolyhedronAttributeStyle>>,
+): Promise<unknown> | undefined {
+  const name = polyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeName(id);
+  const item = polyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeItem(id);
+  const [minimum, maximum] = polyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeRange(id);
+  const colorMap = polyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeColorMap(id);
+  const polyhedron_attribute = { name, item, minimum, maximum, colorMap };
+  if (!isMeshPolyhedraPolyhedronAttributeValid(polyhedron_attribute)) {
+    return undefined;
+  }
+  return polyhedronAttributeStyle.setMeshPolyhedraPolyhedronAttribute(id, polyhedron_attribute);
+}
+
+async function setMeshPolyhedraActiveColoring(
+  id: string,
+  type: string | undefined,
+  deps: Readonly<MeshPolyhedraActiveColoringDeps>,
+): Promise<unknown> {
+  await deps.commonStyle.mutateMeshPolyhedraStyle(id, {
+    coloring: { active: type },
+  });
+  if (type === "constant") {
+    const result = await deps.colorStyle.setMeshPolyhedraColor(
+      id,
+      deps.colorStyle.meshPolyhedraColor(id),
+    );
+    return result;
+  }
+  if (type === "vertex") {
+    const result = await handleMeshPolyhedraVertexColoring(id, deps.vertexAttributeStyle);
+    return result;
+  }
+  if (type === "polyhedron") {
+    const result = await handleMeshPolyhedraPolyhedronColoring(id, deps.polyhedronAttributeStyle);
+    return result;
+  }
+  throw new Error(`Unknown mesh polyhedra coloring type: ${type}`);
+}
+
+async function applyMeshPolyhedraStyle(
+  id: string,
+  visibilityStyle: Readonly<ReturnType<typeof useMeshPolyhedraVisibilityStyle>>,
+  activeColoringType: string | undefined,
+  deps: Readonly<MeshPolyhedraActiveColoringDeps>,
+): Promise<unknown[]> {
+  const result = await Promise.all([
+    visibilityStyle.setMeshPolyhedraVisibility(id, visibilityStyle.meshPolyhedraVisibility(id)),
+    setMeshPolyhedraActiveColoring(id, activeColoringType, deps),
+  ]);
+  return result;
+}
+
+type UseMeshPolyhedraStyleReturn = ReturnType<typeof useMeshPolyhedraCommonStyle> & {
+  meshPolyhedraColoring: (id: string) => StyleValues;
+  meshPolyhedraActiveColoring: (id: string) => string | undefined;
+  setMeshPolyhedraActiveColoring: (id: string, type: string | undefined) => Promise<unknown>;
+  applyMeshPolyhedraStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useMeshPolyhedraVisibilityStyle> &
+  ReturnType<typeof useMeshPolyhedraColorStyle> &
+  ReturnType<typeof useMeshPolyhedraVertexAttributeStyle> &
+  ReturnType<typeof useMeshPolyhedraPolyhedronAttributeStyle>;
+
+export function useMeshPolyhedraStyle(): UseMeshPolyhedraStyleReturn {
   const meshPolyhedraCommonStyle = useMeshPolyhedraCommonStyle();
   const meshPolyhedraVisibility = useMeshPolyhedraVisibilityStyle();
   const meshPolyhedraColorStyle = useMeshPolyhedraColorStyle();
+  const meshPolyhedraVertexAttributeStyle = useMeshPolyhedraVertexAttributeStyle();
+  const meshPolyhedraPolyhedronAttributeStyle = useMeshPolyhedraPolyhedronAttributeStyle();
+
+  const activeColoringDeps: MeshPolyhedraActiveColoringDeps = {
+    commonStyle: meshPolyhedraCommonStyle,
+    colorStyle: meshPolyhedraColorStyle,
+    vertexAttributeStyle: meshPolyhedraVertexAttributeStyle,
+    polyhedronAttributeStyle: meshPolyhedraPolyhedronAttributeStyle,
+  };
 
-  function meshPolyhedraColoring(id: string) {
+  function meshPolyhedraColoring(id: string): StyleValues {
     return meshPolyhedraCommonStyle.meshPolyhedraColoring(id);
   }
-  const meshPolyhedraVertexAttributeStyle = useMeshPolyhedraVertexAttributeStyle();
-  const meshPolyhedraPolyhedronAttributeStyle = useMeshPolyhedraPolyhedronAttributeStyle();
 
   function meshPolyhedraActiveColoring(id: string): string | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.active is defined as string in the data style schema.
     return meshPolyhedraColoring(id).active as string | undefined;
   }
 
-  async function setMeshPolyhedraActiveColoring(id: string, type: string | undefined) {
-    await meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
-      coloring: { active: type },
-    });
-    if (type === "constant") {
-      return meshPolyhedraColorStyle.setMeshPolyhedraColor(
-        id,
-        meshPolyhedraColorStyle.meshPolyhedraColor(id),
-      );
-    }
-    if (type === "vertex") {
-      const name = meshPolyhedraVertexAttributeStyle.meshPolyhedraVertexAttributeName(id);
-      const item = meshPolyhedraVertexAttributeStyle.meshPolyhedraVertexAttributeItem(id);
-      const [minimum, maximum] =
-        meshPolyhedraVertexAttributeStyle.meshPolyhedraVertexAttributeRange(id);
-      const colorMap = meshPolyhedraVertexAttributeStyle.meshPolyhedraVertexAttributeColorMap(id);
-      const vertex_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshPolyhedraVertexAttributeValid(vertex_attribute)) {
-        return;
-      }
-      return meshPolyhedraVertexAttributeStyle.setMeshPolyhedraVertexAttribute(
-        id,
-        vertex_attribute,
-      );
-    }
-    if (type === "polyhedron") {
-      const name = meshPolyhedraPolyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeName(id);
-      const item = meshPolyhedraPolyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeItem(id);
-      const [minimum, maximum] =
-        meshPolyhedraPolyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeRange(id);
-      const colorMap =
-        meshPolyhedraPolyhedronAttributeStyle.meshPolyhedraPolyhedronAttributeColorMap(id);
-      const polyhedron_attribute = { name, item, minimum, maximum, colorMap };
-      if (!isMeshPolyhedraPolyhedronAttributeValid(polyhedron_attribute)) {
-        return;
-      }
-      return meshPolyhedraPolyhedronAttributeStyle.setMeshPolyhedraPolyhedronAttribute(
-        id,
-        polyhedron_attribute,
-      );
-    }
-    throw new Error(`Unknown mesh polyhedra coloring type: ${type}`);
+  async function boundSetMeshPolyhedraActiveColoring(
+    id: string,
+    type: string | undefined,
+  ): Promise<unknown> {
+    const result = await setMeshPolyhedraActiveColoring(id, type, activeColoringDeps);
+    return result;
   }
 
-  function applyMeshPolyhedraStyle(id: string) {
-    return Promise.all([
-      meshPolyhedraVisibility.setMeshPolyhedraVisibility(
-        id,
-        meshPolyhedraVisibility.meshPolyhedraVisibility(id),
-      ),
-      setMeshPolyhedraActiveColoring(id, meshPolyhedraActiveColoring(id)),
-    ]);
+  async function boundApplyMeshPolyhedraStyle(id: string): Promise<unknown[]> {
+    const result = await applyMeshPolyhedraStyle(
+      id,
+      meshPolyhedraVisibility,
+      meshPolyhedraActiveColoring(id),
+      activeColoringDeps,
+    );
+    return result;
   }
 
   return {
     ...meshPolyhedraCommonStyle,
     meshPolyhedraColoring,
     meshPolyhedraActiveColoring,
-    setMeshPolyhedraActiveColoring,
-    applyMeshPolyhedraStyle,
+    setMeshPolyhedraActiveColoring: boundSetMeshPolyhedraActiveColoring,
+    applyMeshPolyhedraStyle: boundApplyMeshPolyhedraStyle,
     ...meshPolyhedraVisibility,
     ...meshPolyhedraColorStyle,
     ...meshPolyhedraVertexAttributeStyle,
diff --git a/internal/stores/data_style/mesh/polyhedra/polyhedron.ts b/internal/stores/data_style/mesh/polyhedra/polyhedron.ts
index d98b64af..342142fe 100644
--- a/internal/stores/data_style/mesh/polyhedra/polyhedron.ts
+++ b/internal/stores/data_style/mesh/polyhedra/polyhedron.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshPolyhedraCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -51,14 +50,39 @@ function isMeshPolyhedraPolyhedronAttributeValid({
 }
 
 // oxlint-disable-next-line max-lines-per-function
-function useMeshPolyhedraPolyhedronAttributeStyle() {
+function useMeshPolyhedraPolyhedronAttributeStyle(): {
+  meshPolyhedraPolyhedronAttributeName: (id: string) => string | undefined;
+  meshPolyhedraPolyhedronAttributeItem: (id: string) => number;
+  meshPolyhedraPolyhedronAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshPolyhedraPolyhedronAttributeColorMap: (id: string) => string | undefined;
+  meshPolyhedraPolyhedronAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshPolyhedraPolyhedronAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshPolyhedraPolyhedronAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshPolyhedraPolyhedronAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshPolyhedraPolyhedronAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshPolyhedraPolyhedronAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshPolyhedraPolyhedronAttributeNoDataColor: (id: string) => unknown;
+  setMeshPolyhedraPolyhedronAttributeNoDataColor: (
+    id: string,
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolyhedraCommonStyle = useMeshPolyhedraCommonStyle();
-  function meshPolyhedraColoring(id: string): StyleValues {
-    return meshPolyhedraCommonStyle.meshPolyhedraStyle(id).coloring as StyleValues;
-  }
   function meshPolyhedraPolyhedronAttribute(id: string): AttributeState {
-    return meshPolyhedraColoring(id).polyhedron as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.polyhedron shape is defined by the data style schema.
+    return meshPolyhedraCommonStyle.meshPolyhedraColoring(id).polyhedron as AttributeState;
   }
   function meshPolyhedraPolyhedronAttributeStoredConfig(
     id: string,
@@ -66,14 +90,10 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshPolyhedraPolyhedronAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,35 +102,41 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshPolyhedraPolyhedronStyle(id: string, values: Record<string, unknown>) {
-    return meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
+  async function mutateMeshPolyhedraPolyhedronStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
       coloring: {
         polyhedron: values,
       },
     });
+    return result;
   }
-  function setMeshPolyhedraPolyhedronAttributeStoredConfig(
+  async function setMeshPolyhedraPolyhedronAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshPolyhedraPolyhedronStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshPolyhedraPolyhedronStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshPolyhedraPolyhedronAttributeName(id: string): string | undefined {
     return meshPolyhedraPolyhedronAttribute(id).name;
   }
   function meshPolyhedraPolyhedronAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshPolyhedraPolyhedronAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -118,7 +144,7 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
     const { item, name } = meshPolyhedraPolyhedronAttribute(id);
     return item ?? meshPolyhedraPolyhedronAttributeLastItem(id, name);
   }
-  function setMeshPolyhedraPolyhedronAttribute(
+  async function setMeshPolyhedraPolyhedronAttribute(
     id: string,
     {
       name,
@@ -128,18 +154,18 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshPolyhedraPolyhedronStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshPolyhedraPolyhedronStyle(id, {
       name,
       item,
     });
-    setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshPolyhedraPolyhedronAttributeSchemas.attribute;
     const params = {
       id,
@@ -155,7 +181,7 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
       params,
     });
   }
-  function applyPolyhedronAttribute(id: string) {
+  async function applyPolyhedronAttribute(id: string): Promise<unknown> {
     const name = meshPolyhedraPolyhedronAttributeName(id);
     const item = meshPolyhedraPolyhedronAttributeItem(id);
     const storedConfig = meshPolyhedraPolyhedronAttributeStoredConfig(id, name, item);
@@ -168,19 +194,27 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshPolyhedraPolyhedronAttributeValid(attribute)) {
-      return setMeshPolyhedraPolyhedronAttribute(id, attribute);
+      const result = await setMeshPolyhedraPolyhedronAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshPolyhedraPolyhedronAttributeName(id: string, name: string) {
+  async function setMeshPolyhedraPolyhedronAttributeName(
+    id: string,
+    name: string,
+  ): Promise<unknown> {
     const item = meshPolyhedraPolyhedronAttributeLastItem(id, name);
-    mutateMeshPolyhedraPolyhedronStyle(id, {
+    await mutateMeshPolyhedraPolyhedronStyle(id, {
       name,
       item,
     });
     return applyPolyhedronAttribute(id);
   }
-  function setMeshPolyhedraPolyhedronAttributeItem(id: string, item: number) {
-    mutateMeshPolyhedraPolyhedronStyle(id, {
+  async function setMeshPolyhedraPolyhedronAttributeItem(
+    id: string,
+    item: number,
+  ): Promise<unknown> {
+    await mutateMeshPolyhedraPolyhedronStyle(id, {
       item,
     });
     return applyPolyhedronAttribute(id);
@@ -193,10 +227,14 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
     const storedConfig = meshPolyhedraPolyhedronAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshPolyhedraPolyhedronAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshPolyhedraPolyhedronAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshPolyhedraPolyhedronAttributeName(id);
     const item = meshPolyhedraPolyhedronAttributeItem(id);
-    setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -208,10 +246,13 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
     const storedConfig = meshPolyhedraPolyhedronAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshPolyhedraPolyhedronAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshPolyhedraPolyhedronAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshPolyhedraPolyhedronAttributeName(id);
     const item = meshPolyhedraPolyhedronAttributeItem(id);
-    setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraPolyhedronAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyPolyhedronAttribute(id);
@@ -225,7 +266,7 @@ function useMeshPolyhedraPolyhedronAttributeStyle() {
   async function setMeshPolyhedraPolyhedronAttributeNoDataColor(
     id: string,
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = meshPolyhedraPolyhedronAttributeName(id);
     const item = meshPolyhedraPolyhedronAttributeItem(id);
     const storedConfig = meshPolyhedraPolyhedronAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/polyhedra/vertex.ts b/internal/stores/data_style/mesh/polyhedra/vertex.ts
index 821ea841..9d436bd3 100644
--- a/internal/stores/data_style/mesh/polyhedra/vertex.ts
+++ b/internal/stores/data_style/mesh/polyhedra/vertex.ts
@@ -3,7 +3,6 @@ import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { useMeshPolyhedraCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
@@ -50,15 +49,42 @@ function isMeshPolyhedraVertexAttributeValid({
   );
 }
 
+interface UseMeshPolyhedraVertexAttributeStyleReturn {
+  meshPolyhedraVertexAttributeName: (id: string) => string | undefined;
+  meshPolyhedraVertexAttributeItem: (id: string) => number;
+  meshPolyhedraVertexAttributeRange: (id: string) => [number | undefined, number | undefined];
+  meshPolyhedraVertexAttributeColorMap: (id: string) => string | undefined;
+  meshPolyhedraVertexAttributeStoredConfig: (
+    id: string,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setMeshPolyhedraVertexAttribute: (id: string, input: AttributeInput) => Promise<unknown>;
+  setMeshPolyhedraVertexAttributeName: (id: string, name: string) => Promise<unknown>;
+  setMeshPolyhedraVertexAttributeItem: (id: string, item: number) => Promise<unknown>;
+  setMeshPolyhedraVertexAttributeRange: (
+    id: string,
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setMeshPolyhedraVertexAttributeColorMap: (
+    id: string,
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  meshPolyhedraVertexAttributeNoDataColor: (id: string) => unknown;
+  setMeshPolyhedraVertexAttributeNoDataColor: (
+    id: string,
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useMeshPolyhedraVertexAttributeStyle() {
+function useMeshPolyhedraVertexAttributeStyle(): UseMeshPolyhedraVertexAttributeStyleReturn {
   const viewerStore = useViewerStore();
   const meshPolyhedraCommonStyle = useMeshPolyhedraCommonStyle();
-  function meshPolyhedraColoring(id: string): StyleValues {
-    return meshPolyhedraCommonStyle.meshPolyhedraStyle(id).coloring as StyleValues;
-  }
   function meshPolyhedraVertexAttribute(id: string): AttributeState {
-    return meshPolyhedraColoring(id).vertex as AttributeState;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
+    return meshPolyhedraCommonStyle.meshPolyhedraColoring(id).vertex as AttributeState;
   }
   function meshPolyhedraVertexAttributeStoredConfig(
     id: string,
@@ -66,14 +92,10 @@ function useMeshPolyhedraVertexAttributeStyle() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = meshPolyhedraVertexAttribute(id);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,35 +104,41 @@ function useMeshPolyhedraVertexAttributeStyle() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateMeshPolyhedraVertexStyle(id: string, values: Record<string, unknown>) {
-    return meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
+  async function mutateMeshPolyhedraVertexStyle(
+    id: string,
+    values: Record<string, unknown>,
+  ): Promise<string> {
+    const result = await meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
       coloring: {
         vertex: values,
       },
     });
+    return result;
   }
-  function setMeshPolyhedraVertexAttributeStoredConfig(
+  async function setMeshPolyhedraVertexAttributeStoredConfig(
     id: string,
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateMeshPolyhedraVertexStyle(id, {
+  ): Promise<string> {
+    const result = await mutateMeshPolyhedraVertexStyle(id, {
       storedConfigs: {
-        [name as string]: {
+        [name ?? ""]: {
           lastItem: item,
-          [item as number]: config,
+          [item ?? 0]: config,
         },
       },
     });
+    return result;
   }
   function meshPolyhedraVertexAttributeName(id: string): string | undefined {
     return meshPolyhedraVertexAttribute(id).name;
   }
   function meshPolyhedraVertexAttributeLastItem(id: string, name: string | undefined): number {
     const { storedConfigs } = meshPolyhedraVertexAttribute(id);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -118,7 +146,7 @@ function useMeshPolyhedraVertexAttributeStyle() {
     const { item, name } = meshPolyhedraVertexAttribute(id);
     return item ?? meshPolyhedraVertexAttributeLastItem(id, name);
   }
-  function setMeshPolyhedraVertexAttribute(
+  async function setMeshPolyhedraVertexAttribute(
     id: string,
     {
       name,
@@ -128,18 +156,18 @@ function useMeshPolyhedraVertexAttributeStyle() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateMeshPolyhedraVertexStyle(id, {
+  ): Promise<unknown> {
+    await mutateMeshPolyhedraVertexStyle(id, {
       name,
       item,
     });
-    setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const schema = meshPolyhedraVertexAttributeSchemas.attribute;
     const params = {
       id,
@@ -155,7 +183,7 @@ function useMeshPolyhedraVertexAttributeStyle() {
       params,
     });
   }
-  function applyVertexAttribute(id: string) {
+  async function applyVertexAttribute(id: string): Promise<unknown> {
     const name = meshPolyhedraVertexAttributeName(id);
     const item = meshPolyhedraVertexAttributeItem(id);
     const storedConfig = meshPolyhedraVertexAttributeStoredConfig(id, name, item);
@@ -168,19 +196,21 @@ function useMeshPolyhedraVertexAttributeStyle() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isMeshPolyhedraVertexAttributeValid(attribute)) {
-      return setMeshPolyhedraVertexAttribute(id, attribute);
+      const result = await setMeshPolyhedraVertexAttribute(id, attribute);
+      return result;
     }
+    return undefined;
   }
-  function setMeshPolyhedraVertexAttributeName(id: string, name: string) {
+  async function setMeshPolyhedraVertexAttributeName(id: string, name: string): Promise<unknown> {
     const item = meshPolyhedraVertexAttributeLastItem(id, name);
-    mutateMeshPolyhedraVertexStyle(id, {
+    await mutateMeshPolyhedraVertexStyle(id, {
       name,
       item,
     });
     return applyVertexAttribute(id);
   }
-  function setMeshPolyhedraVertexAttributeItem(id: string, item: number) {
-    mutateMeshPolyhedraVertexStyle(id, {
+  async function setMeshPolyhedraVertexAttributeItem(id: string, item: number): Promise<unknown> {
+    await mutateMeshPolyhedraVertexStyle(id, {
       item,
     });
     return applyVertexAttribute(id);
@@ -191,10 +221,14 @@ function useMeshPolyhedraVertexAttributeStyle() {
     const storedConfig = meshPolyhedraVertexAttributeStoredConfig(id, name, item);
     return [storedConfig.minimum, storedConfig.maximum];
   }
-  function setMeshPolyhedraVertexAttributeRange(id: string, minimum: number, maximum: number) {
+  async function setMeshPolyhedraVertexAttributeRange(
+    id: string,
+    minimum: number,
+    maximum: number,
+  ): Promise<unknown> {
     const name = meshPolyhedraVertexAttributeName(id);
     const item = meshPolyhedraVertexAttributeItem(id);
-    setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
       minimum,
       maximum,
     });
@@ -206,10 +240,13 @@ function useMeshPolyhedraVertexAttributeStyle() {
     const storedConfig = meshPolyhedraVertexAttributeStoredConfig(id, name, item);
     return storedConfig.colorMap;
   }
-  function setMeshPolyhedraVertexAttributeColorMap(id: string, colorMap: string | undefined) {
+  async function setMeshPolyhedraVertexAttributeColorMap(
+    id: string,
+    colorMap: string | undefined,
+  ): Promise<unknown> {
     const name = meshPolyhedraVertexAttributeName(id);
     const item = meshPolyhedraVertexAttributeItem(id);
-    setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
+    await setMeshPolyhedraVertexAttributeStoredConfig(id, name, item, {
       colorMap,
     });
     return applyVertexAttribute(id);
@@ -220,7 +257,10 @@ function useMeshPolyhedraVertexAttributeStyle() {
     const storedConfig = meshPolyhedraVertexAttributeStoredConfig(id, name, item);
     return storedConfig.no_data_color;
   }
-  async function setMeshPolyhedraVertexAttributeNoDataColor(id: string, no_data_color: unknown) {
+  async function setMeshPolyhedraVertexAttributeNoDataColor(
+    id: string,
+    no_data_color: unknown,
+  ): Promise<unknown> {
     const name = meshPolyhedraVertexAttributeName(id);
     const item = meshPolyhedraVertexAttributeItem(id);
     const storedConfig = meshPolyhedraVertexAttributeStoredConfig(id, name, item);
diff --git a/internal/stores/data_style/mesh/polyhedra/visibility.ts b/internal/stores/data_style/mesh/polyhedra/visibility.ts
index d8b1e16b..fb61d4cd 100644
--- a/internal/stores/data_style/mesh/polyhedra/visibility.ts
+++ b/internal/stores/data_style/mesh/polyhedra/visibility.ts
@@ -8,27 +8,37 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra.visibility;
 
-export function useMeshPolyhedraVisibilityStyle() {
+export function useMeshPolyhedraVisibilityStyle(): {
+  meshPolyhedraVisibility: (id: string) => boolean | undefined;
+  setMeshPolyhedraVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const meshPolyhedraCommonStyle = useMeshPolyhedraCommonStyle();
 
   function meshPolyhedraVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility is defined as boolean in the data style schema.
     return meshPolyhedraCommonStyle.meshPolyhedraStyle(id).visibility as boolean | undefined;
   }
-  function setMeshPolyhedraVisibility(id: string, visibility: boolean | undefined) {
+  async function setMeshPolyhedraVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () =>
-          meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
+        response_function: async () => {
+          const mutation_result = await meshPolyhedraCommonStyle.mutateMeshPolyhedraStyle(id, {
             visibility,
-          }),
+          });
+          return mutation_result;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/model/blocks/color.ts b/internal/stores/data_style/model/blocks/color.ts
index fb5311c4..87f2aee7 100644
--- a/internal/stores/data_style/model/blocks/color.ts
+++ b/internal/stores/data_style/model/blocks/color.ts
@@ -1,24 +1,38 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import {
   isModelBlocksPolyhedronAttributeValid,
   useModelBlocksPolyhedronAttribute,
 } from "./polyhedron";
 import { isModelBlocksVertexAttributeValid, useModelBlocksVertexAttribute } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useModelBlocksCommonStyle } from "./common";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.blocks.color;
 
-export function useModelBlocksColor() {
+export function useModelBlocksColor(): {
+  modelBlockColoring: (id: string, block_id?: string) => StyleValues;
+  modelBlockColor: (id: string, block_id?: string) => unknown;
+  setModelBlocksColor: (
+    modelId: string,
+    blocks_ids: string[],
+    color: unknown,
+    activeColoring?: string,
+  ) => Promise<unknown>;
+  modelBlockActiveColoring: (id: string, block_id?: string) => unknown;
+  setModelBlocksActiveColoring: (
+    modelId: string,
+    blocks_ids: string[],
+    activeColoring: string,
+  ) => Promise<void>;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelBlocksCommonStyle = useModelBlocksCommonStyle();
   const modelBlocksVertexAttribute = useModelBlocksVertexAttribute();
   const modelBlocksPolyhedronAttribute = useModelBlocksPolyhedronAttribute();
 
   function modelBlockColoring(id: string, block_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelBlocksCommonStyle.modelBlockStyle(id, block_id).coloring as StyleValues;
   }
 
@@ -26,13 +40,20 @@ export function useModelBlocksColor() {
     return modelBlockColoring(id, block_id).constant;
   }
 
-  function setModelBlocksColor(
+  async function setModelBlocksColor(
     modelId: string,
     blocks_ids: string[],
     color: unknown,
     activeColoring = "constant",
-  ) {
-    return modelCommonStyle.setModelTypeColor(modelId, blocks_ids, color, schema, activeColoring);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeColor(
+      modelId,
+      blocks_ids,
+      color,
+      schema,
+      activeColoring,
+    );
+    return result;
   }
 
   function modelBlockActiveColoring(id: string, block_id?: string): unknown {
@@ -43,9 +64,9 @@ export function useModelBlocksColor() {
     modelId: string,
     blocks_ids: string[],
     activeColoring: string,
-  ) {
+  ): Promise<void> {
     if (blocks_ids.length > 1) {
-      modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
+      await modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
         active: activeColoring,
       });
     }
@@ -54,7 +75,8 @@ export function useModelBlocksColor() {
     });
     if (activeColoring === "constant" || activeColoring === "random") {
       const color = modelBlockColor(modelId, blocks_ids[0]);
-      return setModelBlocksColor(modelId, blocks_ids, color, activeColoring);
+      await setModelBlocksColor(modelId, blocks_ids, color, activeColoring);
+      return;
     }
 
     if (activeColoring === "vertex") {
@@ -76,7 +98,7 @@ export function useModelBlocksColor() {
       );
       const attribute = { name, item, minimum, maximum, colorMap };
       if (isModelBlocksVertexAttributeValid(attribute)) {
-        return modelBlocksVertexAttribute.setModelBlocksVertexAttribute(
+        await modelBlocksVertexAttribute.setModelBlocksVertexAttribute(
           modelId,
           blocks_ids,
           attribute,
@@ -101,7 +123,7 @@ export function useModelBlocksColor() {
       );
       const attribute = { name, item, minimum, maximum, colorMap };
       if (isModelBlocksPolyhedronAttributeValid(attribute)) {
-        return modelBlocksPolyhedronAttribute.setModelBlocksPolyhedronAttribute(
+        await modelBlocksPolyhedronAttribute.setModelBlocksPolyhedronAttribute(
           modelId,
           blocks_ids,
           attribute,
diff --git a/internal/stores/data_style/model/blocks/common.ts b/internal/stores/data_style/model/blocks/common.ts
index 516c29ac..81cefe9b 100644
--- a/internal/stores/data_style/model/blocks/common.ts
+++ b/internal/stores/data_style/model/blocks/common.ts
@@ -3,12 +3,22 @@ import merge from "lodash/merge";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 
-export function useModelBlocksCommonStyle() {
+export function useModelBlocksCommonStyle(): {
+  modelBlocksStyle: (id: string) => StyleValues;
+  modelBlockStyle: (id: string, block_id?: string) => StyleValues;
+  modelBlockColoring: (id: string, block_id?: string) => StyleValues;
+  mutateModelBlocksColoring: (
+    id: string,
+    blocks_ids: string[],
+    values: StyleValues,
+  ) => Promise<void>;
+  mutateModelBlocksTypeColoring: (id: string, values: StyleValues) => Promise<void>;
+} {
   const dataStyleState = useDataStyleState();
   const modelCommonStyle = useModelCommonStyle();
 
   function modelBlocksStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).blocks as StyleValues;
+    return dataStyleState.getStyle(id).blocks ?? {};
   }
 
   function modelComponentTypeBlocksStyle(id: string): StyleValues {
@@ -27,17 +37,22 @@ export function useModelBlocksCommonStyle() {
   }
 
   function modelBlockColoring(id: string, block_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelBlockStyle(id, block_id).coloring as StyleValues;
   }
 
-  function mutateModelBlocksColoring(id: string, blocks_ids: string[], values: StyleValues) {
-    return modelCommonStyle.mutateComponentStyles(id, blocks_ids, {
+  async function mutateModelBlocksColoring(
+    id: string,
+    blocks_ids: string[],
+    values: StyleValues,
+  ): Promise<void> {
+    await modelCommonStyle.mutateComponentStyles(id, blocks_ids, {
       coloring: values,
     });
   }
 
-  function mutateModelBlocksTypeColoring(id: string, values: StyleValues) {
-    return modelCommonStyle.mutateModelComponentTypeStyle(id, "Block", {
+  async function mutateModelBlocksTypeColoring(id: string, values: StyleValues): Promise<void> {
+    await modelCommonStyle.mutateModelComponentTypeStyle(id, "Block", {
       coloring: values,
     });
   }
diff --git a/internal/stores/data_style/model/blocks/index.ts b/internal/stores/data_style/model/blocks/index.ts
index e9ecea11..82f0d86e 100644
--- a/internal/stores/data_style/model/blocks/index.ts
+++ b/internal/stores/data_style/model/blocks/index.ts
@@ -22,12 +22,21 @@ interface AttributeGroup {
   blocks_ids: string[];
 }
 
-async function setModelBlocksDefaultStyle(_id: string) {
+async function setModelBlocksDefaultStyle(_id: string): Promise<void> {
   // Placeholder
 }
 
+type UseModelBlocksStyleReturn = {
+  applyModelBlocksStyle: (modelId: string) => Promise<void>;
+  setModelBlocksDefaultStyle: (id: string) => Promise<void>;
+} & ReturnType<typeof useModelBlocksCommonStyle> &
+  ReturnType<typeof useModelBlocksVisibility> &
+  ReturnType<typeof useModelBlocksColor> &
+  ReturnType<typeof useModelBlocksVertexAttribute> &
+  ReturnType<typeof useModelBlocksPolyhedronAttribute>;
+
 // oxlint-disable-next-line max-lines-per-function
-export function useModelBlocksStyle() {
+export function useModelBlocksStyle(): UseModelBlocksStyleReturn {
   const dataStore = useDataStore();
   const modelCommonStyle = useModelBlocksCommonStyle();
   const modelVisibilityStyle = useModelBlocksVisibility();
@@ -35,30 +44,38 @@ export function useModelBlocksStyle() {
   const modelBlocksVertexAttribute = useModelBlocksVertexAttribute();
   const modelBlocksPolyhedronAttribute = useModelBlocksPolyhedronAttribute();
 
-  function applyModelBlocksVisibilityStyle(modelId: string, blocks_ids: string[]) {
+  async function applyModelBlocksVisibilityStyle(
+    modelId: string,
+    blocks_ids: string[],
+  ): Promise<unknown[]> {
     const visibilityGroups: Record<string, string[]> = {};
     for (const block_id of blocks_ids) {
       const style = modelCommonStyle.modelBlockStyle(modelId, block_id);
       const visibility = String(style.visibility);
-      if (!visibilityGroups[visibility]) {
-        visibilityGroups[visibility] = [];
-      }
+      visibilityGroups[visibility] ??= [];
       visibilityGroups[visibility].push(block_id);
     }
-    return Promise.all(
-      Object.entries(visibilityGroups).map(([visibility, ids]) =>
-        modelVisibilityStyle.setModelBlocksVisibility(modelId, ids, visibility === "true"),
-      ),
+    const result = await Promise.all(
+      Object.entries(visibilityGroups).map(async ([visibility, ids]) => {
+        const visibilityResult = await modelVisibilityStyle.setModelBlocksVisibility(
+          modelId,
+          ids,
+          visibility === "true",
+        );
+        return visibilityResult;
+      }),
     );
+    return result;
   }
 
-  function applyModelBlocksColoringStyle(modelId: string, blocks_ids: string[]) {
+  async function applyModelBlocksColoringStyle(
+    modelId: string,
+    blocks_ids: string[],
+  ): Promise<unknown[]> {
     const activeColoringGroups: Record<string, string[]> = {};
     for (const block_id of blocks_ids) {
       const activeColoring = String(modelColorStyle.modelBlockActiveColoring(modelId, block_id));
-      if (!activeColoringGroups[activeColoring]) {
-        activeColoringGroups[activeColoring] = [];
-      }
+      activeColoringGroups[activeColoring] ??= [];
       activeColoringGroups[activeColoring].push(block_id);
     }
 
@@ -70,15 +87,19 @@ export function useModelBlocksStyle() {
         for (const block_id of type_blocks_ids) {
           const color = modelColorStyle.modelBlockColor(modelId, block_id);
           const color_key = JSON.stringify(color);
-          if (!colorGroups[color_key]) {
-            colorGroups[color_key] = { color, blocks_ids: [] };
-          }
+          colorGroups[color_key] ??= { color, blocks_ids: [] };
           colorGroups[color_key].blocks_ids.push(block_id);
         }
         coloringPromises.push(
-          ...Object.values(colorGroups).map(({ color, blocks_ids: ids }) =>
-            modelColorStyle.setModelBlocksColor(modelId, ids, color, "constant"),
-          ),
+          ...Object.values(colorGroups).map(async ({ color, blocks_ids: ids }) => {
+            const result = await modelColorStyle.setModelBlocksColor(
+              modelId,
+              ids,
+              color,
+              "constant",
+            );
+            return result;
+          }),
         );
       } else if (type === "random") {
         coloringPromises.push(
@@ -102,28 +123,32 @@ export function useModelBlocksStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!vertexGroups[key]) {
-            vertexGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              blocks_ids: [],
-            };
-          }
+          vertexGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            blocks_ids: [],
+          };
           vertexGroups[key].blocks_ids.push(block_id);
         }
         coloringPromises.push(
           ...Object.values(vertexGroups).map(
-            ({ name, item, minimum, maximum, colorMap, blocks_ids: ids }) =>
-              modelBlocksVertexAttribute.setModelBlocksVertexAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, blocks_ids: ids }) => {
+              const result = await modelBlocksVertexAttribute.setModelBlocksVertexAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       } else if (type === "polyhedron") {
@@ -148,43 +173,48 @@ export function useModelBlocksStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!polyhedronGroups[key]) {
-            polyhedronGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              blocks_ids: [],
-            };
-          }
+          polyhedronGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            blocks_ids: [],
+          };
           polyhedronGroups[key].blocks_ids.push(block_id);
         }
         coloringPromises.push(
           ...Object.values(polyhedronGroups).map(
-            ({ name, item, minimum, maximum, colorMap, blocks_ids: ids }) =>
-              modelBlocksPolyhedronAttribute.setModelBlocksPolyhedronAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, blocks_ids: ids }) => {
+              const result = await modelBlocksPolyhedronAttribute.setModelBlocksPolyhedronAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       }
     }
 
-    return Promise.all(coloringPromises);
+    const result = await Promise.all(coloringPromises);
+    return result;
   }
 
-  async function applyModelBlocksStyle(modelId: string) {
+  async function applyModelBlocksStyle(modelId: string): Promise<void> {
     const blocks_ids = await dataStore.getBlocksGeodeIds(modelId);
     if (blocks_ids.length === 0) {
       return;
     }
 
-    return Promise.all([
+    await Promise.all([
       applyModelBlocksVisibilityStyle(modelId, blocks_ids),
       applyModelBlocksColoringStyle(modelId, blocks_ids),
     ]);
diff --git a/internal/stores/data_style/model/blocks/polyhedron.ts b/internal/stores/data_style/model/blocks/polyhedron.ts
index ab4b05df..128542d2 100644
--- a/internal/stores/data_style/model/blocks/polyhedron.ts
+++ b/internal/stores/data_style/model/blocks/polyhedron.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -50,12 +51,61 @@ function isModelBlocksPolyhedronAttributeValid({
   );
 }
 
+interface UseModelBlocksPolyhedronAttributeReturn {
+  modelBlocksPolyhedronAttributeName: (modelId: string, blockId?: string) => string | undefined;
+  modelBlocksPolyhedronAttributeItem: (modelId: string, blockId?: string) => number;
+  modelBlocksPolyhedronAttributeRange: (
+    modelId: string,
+    blockId?: string,
+  ) => [number | undefined, number | undefined];
+  modelBlocksPolyhedronAttributeColorMap: (modelId: string, blockId?: string) => string | undefined;
+  modelBlocksPolyhedronAttributeStoredConfig: (
+    modelId: string,
+    blockId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelBlocksPolyhedronAttribute: (
+    modelId: string,
+    blockIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelBlocksPolyhedronAttributeName: (
+    modelId: string,
+    blockIds: string[],
+    name: string,
+  ) => Promise<unknown>;
+  setModelBlocksPolyhedronAttributeItem: (
+    modelId: string,
+    blockIds: string[],
+    item: number,
+  ) => Promise<unknown>;
+  setModelBlocksPolyhedronAttributeRange: (
+    modelId: string,
+    blockIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setModelBlocksPolyhedronAttributeColorMap: (
+    modelId: string,
+    blockIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  modelBlocksPolyhedronAttributeNoDataColor: (modelId: string, blockId?: string) => unknown;
+  setModelBlocksPolyhedronAttributeNoDataColor: (
+    modelId: string,
+    blockIds: string[],
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelBlocksPolyhedronAttribute() {
+function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeReturn {
   const dataStore = useDataStore();
   const modelBlocksCommonStyle = useModelBlocksCommonStyle();
   const viewerStore = useViewerStore();
   function modelBlocksPolyhedronAttribute(modelId: string, blockId?: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.polyhedron shape is defined by the data style schema.
     return modelBlocksCommonStyle.modelBlockColoring(modelId, blockId).polyhedron as AttributeState;
   }
   function modelBlocksPolyhedronAttributeStoredConfig(
@@ -65,14 +115,10 @@ function useModelBlocksPolyhedronAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelBlocksPolyhedronAttribute(modelId, blockId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -81,32 +127,40 @@ function useModelBlocksPolyhedronAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelBlocksPolyhedronStyle(
+  async function mutateModelBlocksPolyhedronStyle(
     modelId: string,
     blockIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (blockIds.length > 1) {
-      modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelBlocksCommonStyle.mutateModelBlocksColoring(modelId, blockIds, {
         polyhedron: values,
-      });
+      }),
+    ];
+    if (blockIds.length > 1) {
+      tasks.push(
+        modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
+          polyhedron: values,
+        }),
+      );
     }
-    return modelBlocksCommonStyle.mutateModelBlocksColoring(modelId, blockIds, {
-      polyhedron: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelBlocksPolyhedronAttributeStoredConfig(
+  async function setModelBlocksPolyhedronAttributeStoredConfig(
     modelId: string,
     blockIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
+  ): Promise<void> {
+    if (name === undefined || item === undefined) {
+      return;
+    }
+    await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       storedConfigs: {
-        [name as string]: {
+        [name]: {
           lastItem: item,
-          [item as number]: config,
+          [item]: config,
         },
       },
     });
@@ -123,8 +177,9 @@ function useModelBlocksPolyhedronAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelBlocksPolyhedronAttribute(modelId, blockId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -165,18 +220,18 @@ function useModelBlocksPolyhedronAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
+  ): Promise<unknown> {
+    await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       name,
       item,
     });
-    setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, blockIds);
     const params = {
       id: modelId,
@@ -193,7 +248,7 @@ function useModelBlocksPolyhedronAttribute() {
       params,
     });
   }
-  function applyPolyhedronAttribute(modelId: string, blockIds: string[]) {
+  async function applyPolyhedronAttribute(modelId: string, blockIds: string[]): Promise<unknown> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksPolyhedronAttributeStoredConfig(
@@ -211,54 +266,55 @@ function useModelBlocksPolyhedronAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelBlocksPolyhedronAttributeValid(attribute)) {
-      return setModelBlocksPolyhedronAttribute(modelId, blockIds, attribute);
+      const result = await setModelBlocksPolyhedronAttribute(modelId, blockIds, attribute);
+      return result;
     }
-    return Promise.resolve();
+    return undefined;
   }
-  function setModelBlocksPolyhedronAttributeName(
+  async function setModelBlocksPolyhedronAttributeName(
     modelId: string,
     blockIds: string[],
     name: string,
-  ) {
+  ): Promise<unknown> {
     const item = modelBlocksPolyhedronAttributeLastItem(modelId, blockIds[0], name);
-    mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
+    await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       name,
       item,
     });
     return applyPolyhedronAttribute(modelId, blockIds);
   }
-  function setModelBlocksPolyhedronAttributeItem(
+  async function setModelBlocksPolyhedronAttributeItem(
     modelId: string,
     blockIds: string[],
     item: number,
-  ) {
-    mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
+  ): Promise<unknown> {
+    await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       item,
     });
     return applyPolyhedronAttribute(modelId, blockIds);
   }
-  function setModelBlocksPolyhedronAttributeRange(
+  async function setModelBlocksPolyhedronAttributeRange(
     modelId: string,
     blockIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
-    setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
       minimum,
       maximum,
     });
     return applyPolyhedronAttribute(modelId, blockIds);
   }
-  function setModelBlocksPolyhedronAttributeColorMap(
+  async function setModelBlocksPolyhedronAttributeColorMap(
     modelId: string,
     blockIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
-    setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
       colorMap,
     });
     return applyPolyhedronAttribute(modelId, blockIds);
@@ -273,7 +329,7 @@ function useModelBlocksPolyhedronAttribute() {
     modelId: string,
     blockIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksPolyhedronAttributeStoredConfig(
diff --git a/internal/stores/data_style/model/blocks/vertex.ts b/internal/stores/data_style/model/blocks/vertex.ts
index 23bf0529..f931ad99 100644
--- a/internal/stores/data_style/model/blocks/vertex.ts
+++ b/internal/stores/data_style/model/blocks/vertex.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -49,12 +50,61 @@ function isModelBlocksVertexAttributeValid({
   );
 }
 
+interface UseModelBlocksVertexAttributeReturn {
+  modelBlocksVertexAttributeName: (modelId: string, blockId?: string) => string | undefined;
+  modelBlocksVertexAttributeItem: (modelId: string, blockId?: string) => number;
+  modelBlocksVertexAttributeRange: (
+    modelId: string,
+    blockId?: string,
+  ) => [number | undefined, number | undefined];
+  modelBlocksVertexAttributeColorMap: (modelId: string, blockId?: string) => string | undefined;
+  modelBlocksVertexAttributeStoredConfig: (
+    modelId: string,
+    blockId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelBlocksVertexAttribute: (
+    modelId: string,
+    blockIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelBlocksVertexAttributeName: (
+    modelId: string,
+    blockIds: string[],
+    name: string,
+  ) => Promise<unknown>;
+  setModelBlocksVertexAttributeItem: (
+    modelId: string,
+    blockIds: string[],
+    item: number,
+  ) => Promise<unknown>;
+  setModelBlocksVertexAttributeRange: (
+    modelId: string,
+    blockIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setModelBlocksVertexAttributeColorMap: (
+    modelId: string,
+    blockIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  modelBlocksVertexAttributeNoDataColor: (modelId: string, blockId?: string) => unknown;
+  setModelBlocksVertexAttributeNoDataColor: (
+    modelId: string,
+    blockIds: string[],
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelBlocksVertexAttribute() {
+function useModelBlocksVertexAttribute(): UseModelBlocksVertexAttributeReturn {
   const dataStore = useDataStore();
   const modelBlocksCommonStyle = useModelBlocksCommonStyle();
   const viewerStore = useViewerStore();
   function modelBlocksVertexAttribute(modelId: string, blockId?: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
     return modelBlocksCommonStyle.modelBlockColoring(modelId, blockId).vertex as AttributeState;
   }
   function modelBlocksVertexAttributeStoredConfig(
@@ -64,14 +114,10 @@ function useModelBlocksVertexAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelBlocksVertexAttribute(modelId, blockId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -80,32 +126,40 @@ function useModelBlocksVertexAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelBlocksVertexStyle(
+  async function mutateModelBlocksVertexStyle(
     modelId: string,
     blockIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (blockIds.length > 1) {
-      modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelBlocksCommonStyle.mutateModelBlocksColoring(modelId, blockIds, {
         vertex: values,
-      });
+      }),
+    ];
+    if (blockIds.length > 1) {
+      tasks.push(
+        modelBlocksCommonStyle.mutateModelBlocksTypeColoring(modelId, {
+          vertex: values,
+        }),
+      );
     }
-    return modelBlocksCommonStyle.mutateModelBlocksColoring(modelId, blockIds, {
-      vertex: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelBlocksVertexAttributeStoredConfig(
+  async function setModelBlocksVertexAttributeStoredConfig(
     modelId: string,
     blockIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelBlocksVertexStyle(modelId, blockIds, {
+  ): Promise<void> {
+    if (name === undefined || item === undefined) {
+      return;
+    }
+    await mutateModelBlocksVertexStyle(modelId, blockIds, {
       storedConfigs: {
-        [name as string]: {
+        [name]: {
           lastItem: item,
-          [item as number]: config,
+          [item]: config,
         },
       },
     });
@@ -119,8 +173,9 @@ function useModelBlocksVertexAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelBlocksVertexAttribute(modelId, blockId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -161,18 +216,18 @@ function useModelBlocksVertexAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelBlocksVertexStyle(modelId, blockIds, {
+  ): Promise<unknown> {
+    await mutateModelBlocksVertexStyle(modelId, blockIds, {
       name,
       item,
     });
-    setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const block_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, blockIds);
     const params = {
       id: modelId,
@@ -189,7 +244,7 @@ function useModelBlocksVertexAttribute() {
       params,
     });
   }
-  function applyVertexAttribute(modelId: string, blockIds: string[]) {
+  async function applyVertexAttribute(modelId: string, blockIds: string[]): Promise<unknown> {
     const name = modelBlocksVertexAttributeName(modelId, blockIds[0]);
     const item = modelBlocksVertexAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksVertexAttributeStoredConfig(modelId, blockIds[0], name, item);
@@ -202,46 +257,55 @@ function useModelBlocksVertexAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelBlocksVertexAttributeValid(attribute)) {
-      return setModelBlocksVertexAttribute(modelId, blockIds, attribute);
+      const result = await setModelBlocksVertexAttribute(modelId, blockIds, attribute);
+      return result;
     }
-    return Promise.resolve();
+    return undefined;
   }
-  function setModelBlocksVertexAttributeName(modelId: string, blockIds: string[], name: string) {
+  async function setModelBlocksVertexAttributeName(
+    modelId: string,
+    blockIds: string[],
+    name: string,
+  ): Promise<unknown> {
     const item = modelBlocksVertexAttributeLastItem(modelId, blockIds[0], name);
-    mutateModelBlocksVertexStyle(modelId, blockIds, {
+    await mutateModelBlocksVertexStyle(modelId, blockIds, {
       name,
       item,
     });
     return applyVertexAttribute(modelId, blockIds);
   }
-  function setModelBlocksVertexAttributeItem(modelId: string, blockIds: string[], item: number) {
-    mutateModelBlocksVertexStyle(modelId, blockIds, {
+  async function setModelBlocksVertexAttributeItem(
+    modelId: string,
+    blockIds: string[],
+    item: number,
+  ): Promise<unknown> {
+    await mutateModelBlocksVertexStyle(modelId, blockIds, {
       item,
     });
     return applyVertexAttribute(modelId, blockIds);
   }
-  function setModelBlocksVertexAttributeRange(
+  async function setModelBlocksVertexAttributeRange(
     modelId: string,
     blockIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksVertexAttributeName(modelId, blockIds[0]);
     const item = modelBlocksVertexAttributeItem(modelId, blockIds[0]);
-    setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
       minimum,
       maximum,
     });
     return applyVertexAttribute(modelId, blockIds);
   }
-  function setModelBlocksVertexAttributeColorMap(
+  async function setModelBlocksVertexAttributeColorMap(
     modelId: string,
     blockIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksVertexAttributeName(modelId, blockIds[0]);
     const item = modelBlocksVertexAttributeItem(modelId, blockIds[0]);
-    setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
+    await setModelBlocksVertexAttributeStoredConfig(modelId, blockIds, name, item, {
       colorMap,
     });
     return applyVertexAttribute(modelId, blockIds);
@@ -256,7 +320,7 @@ function useModelBlocksVertexAttribute() {
     modelId: string,
     blockIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = modelBlocksVertexAttributeName(modelId, blockIds[0]);
     const item = modelBlocksVertexAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksVertexAttributeStoredConfig(modelId, blockIds[0], name, item);
diff --git a/internal/stores/data_style/model/blocks/visibility.ts b/internal/stores/data_style/model/blocks/visibility.ts
index ce9c77f4..517cdc7c 100644
--- a/internal/stores/data_style/model/blocks/visibility.ts
+++ b/internal/stores/data_style/model/blocks/visibility.ts
@@ -4,7 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.blocks.visibility;
 
-export function useModelBlocksVisibility() {
+export function useModelBlocksVisibility(): {
+  setModelBlocksVisibility: (
+    modelId: string,
+    blocks_ids: string[],
+    visibility: boolean | undefined,
+  ) => Promise<unknown>;
+  modelBlockVisibility: (id: string, block_id?: string) => unknown;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelBlocksCommonStyle = useModelBlocksCommonStyle();
 
@@ -12,12 +19,18 @@ export function useModelBlocksVisibility() {
     return modelBlocksCommonStyle.modelBlockStyle(id, block_id).visibility;
   }
 
-  function setModelBlocksVisibility(
+  async function setModelBlocksVisibility(
     modelId: string,
     blocks_ids: string[],
     visibility: boolean | undefined,
-  ) {
-    return modelCommonStyle.setModelTypeVisibility(modelId, blocks_ids, visibility, schema);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeVisibility(
+      modelId,
+      blocks_ids,
+      visibility,
+      schema,
+    );
+    return result;
   }
 
   return { setModelBlocksVisibility, modelBlockVisibility };
diff --git a/internal/stores/data_style/model/color.ts b/internal/stores/data_style/model/color.ts
index 99bc8cf6..ba3ea758 100644
--- a/internal/stores/data_style/model/color.ts
+++ b/internal/stores/data_style/model/color.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { dispatchToComponentTypes } from "./visibility";
 import { useDataStore } from "@ogw_front/stores/data";
@@ -5,7 +6,7 @@ import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 
 // The four per-component-type style composables (Surface/Line/Block/Corner) each expose a different, large set of methods (color, visibility, per-attribute-kind getters/setters...). This module only cares about looking a handful of them up dynamically by name (built into ATTRIBUTE_FUNCTIONS below), so a precise structural type for componentStyleFunctions isn't worth modelling here; `any` keeps the dynamic dispatch table honest about that.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// oxlint-disable-next-line @typescript-eslint/no-explicit-any
 type ComponentStyleFunctions = Record<"Surface" | "Line" | "Block" | "Corner", any>;
 
 interface AttributeAccessors {
@@ -17,92 +18,163 @@ interface AttributeAccessors {
   setColorMap: (modelId: string, componentIds: string[], colorMap: string) => unknown;
 }
 
+// The signatures below describe just the per-attribute-kind methods this module reads off each dynamically-typed composable (see the `any` in ComponentStyleFunctions above). `attributeFn` narrows one such method to its known signature so every downstream read/call is a real, checked type instead of `any`.
+type AttributeNameFn = (modelId: string, componentId: string) => string | undefined;
+type SetAttributeNameFn = (modelId: string, componentIds: string[], name: string) => unknown;
+type AttributeRangeFn = (
+  modelId: string,
+  componentId: string,
+) => [number | undefined, number | undefined];
+type SetAttributeRangeFn = (
+  modelId: string,
+  componentIds: string[],
+  minimum: number,
+  maximum: number,
+) => unknown;
+type AttributeColorMapFn = (modelId: string, componentId: string) => string | undefined;
+type SetAttributeColorMapFn = (
+  modelId: string,
+  componentIds: string[],
+  colorMap: string,
+) => unknown;
+type DynamicStyleFunctions = Record<string, unknown>;
+
+// oxlint-disable-next-line no-unnecessary-type-parameters -- Signature narrows a dynamically-looked-up method to its known call signature; see comment above.
+function attributeFn<Signature>(method: unknown): Signature {
+  // oxlint-disable-next-line no-unsafe-type-assertion -- narrowing a dynamically-looked-up method to its known call signature; see comment above.
+  return method as Signature;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
+function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions): {
+  getModelColor: (modelId: string) => unknown;
+  getModelActiveColoring: (modelId: string) => unknown;
+  getModelComponentColor: (modelId: string, componentId: string) => unknown;
+  getModelComponentEffectiveColor: (modelId: string, componentId: string, type: string) => unknown;
+  getModelComponentActiveColoring: (modelId: string, componentId: string) => unknown;
+  modelComponentTypeColor: (modelId: string, type: string) => unknown;
+  getModelComponentTypeActiveColoring: (modelId: string, type: string) => unknown;
+  setModelComponentTypeColor: (modelId: string, type: string, color: unknown) => Promise<void>;
+  setModelComponentTypeActiveColoring: (
+    modelId: string,
+    type: string,
+    activeColoring: string,
+  ) => Promise<void>;
+  setModelComponentActiveColoring: (
+    modelId: string,
+    componentId: string,
+    activeColoring: string,
+  ) => Promise<void>;
+  setModelComponentsColor: (
+    modelId: string,
+    componentIds: string[],
+    color: unknown,
+    activeColoring?: string,
+  ) => Promise<unknown[]>;
+} {
   const dataStore = useDataStore();
   const dataStyleState = useDataStyleState();
   const modelCommonStyle = useModelCommonStyle();
-  const { Surface, Line, Block, Corner } = componentStyleFunctions;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- componentStyleFunctions is a dynamic dispatch table typed any by design; see ComponentStyleFunctions comment above.
+  const Surface = componentStyleFunctions.Surface as DynamicStyleFunctions;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- componentStyleFunctions is a dynamic dispatch table typed any by design; see ComponentStyleFunctions comment above.
+  const Line = componentStyleFunctions.Line as DynamicStyleFunctions;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- componentStyleFunctions is a dynamic dispatch table typed any by design; see ComponentStyleFunctions comment above.
+  const Block = componentStyleFunctions.Block as DynamicStyleFunctions;
+  // oxlint-disable-next-line no-unsafe-type-assertion -- componentStyleFunctions is a dynamic dispatch table typed any by design; see ComponentStyleFunctions comment above.
+  const Corner = componentStyleFunctions.Corner as DynamicStyleFunctions;
   const ATTRIBUTE_FUNCTIONS: Record<string, Record<string, AttributeAccessors>> = {
     Surface: {
       vertex: {
-        getName: Surface.modelSurfacesVertexAttributeName,
-        setName: Surface.setModelSurfacesVertexAttributeName,
-        getRange: Surface.modelSurfacesVertexAttributeRange,
-        setRange: Surface.setModelSurfacesVertexAttributeRange,
-        getColorMap: Surface.modelSurfacesVertexAttributeColorMap,
-        setColorMap: Surface.setModelSurfacesVertexAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Surface.modelSurfacesVertexAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Surface.setModelSurfacesVertexAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Surface.modelSurfacesVertexAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Surface.setModelSurfacesVertexAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Surface.modelSurfacesVertexAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(
+          Surface.setModelSurfacesVertexAttributeColorMap,
+        ),
       },
       polygon: {
-        getName: Surface.modelSurfacesPolygonAttributeName,
-        setName: Surface.setModelSurfacesPolygonAttributeName,
-        getRange: Surface.modelSurfacesPolygonAttributeRange,
-        setRange: Surface.setModelSurfacesPolygonAttributeRange,
-        getColorMap: Surface.modelSurfacesPolygonAttributeColorMap,
-        setColorMap: Surface.setModelSurfacesPolygonAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Surface.modelSurfacesPolygonAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Surface.setModelSurfacesPolygonAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Surface.modelSurfacesPolygonAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Surface.setModelSurfacesPolygonAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(
+          Surface.modelSurfacesPolygonAttributeColorMap,
+        ),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(
+          Surface.setModelSurfacesPolygonAttributeColorMap,
+        ),
       },
     },
     Line: {
       vertex: {
-        getName: Line.modelLinesVertexAttributeName,
-        setName: Line.setModelLinesVertexAttributeName,
-        getRange: Line.modelLinesVertexAttributeRange,
-        setRange: Line.setModelLinesVertexAttributeRange,
-        getColorMap: Line.modelLinesVertexAttributeColorMap,
-        setColorMap: Line.setModelLinesVertexAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Line.modelLinesVertexAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Line.setModelLinesVertexAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Line.modelLinesVertexAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Line.setModelLinesVertexAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Line.modelLinesVertexAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(Line.setModelLinesVertexAttributeColorMap),
       },
       edge: {
-        getName: Line.modelLinesEdgeAttributeName,
-        setName: Line.setModelLinesEdgeAttributeName,
-        getRange: Line.modelLinesEdgeAttributeRange,
-        setRange: Line.setModelLinesEdgeAttributeRange,
-        getColorMap: Line.modelLinesEdgeAttributeColorMap,
-        setColorMap: Line.setModelLinesEdgeAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Line.modelLinesEdgeAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Line.setModelLinesEdgeAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Line.modelLinesEdgeAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Line.setModelLinesEdgeAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Line.modelLinesEdgeAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(Line.setModelLinesEdgeAttributeColorMap),
       },
     },
     Block: {
       vertex: {
-        getName: Block.modelBlocksVertexAttributeName,
-        setName: Block.setModelBlocksVertexAttributeName,
-        getRange: Block.modelBlocksVertexAttributeRange,
-        setRange: Block.setModelBlocksVertexAttributeRange,
-        getColorMap: Block.modelBlocksVertexAttributeColorMap,
-        setColorMap: Block.setModelBlocksVertexAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Block.modelBlocksVertexAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Block.setModelBlocksVertexAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Block.modelBlocksVertexAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Block.setModelBlocksVertexAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Block.modelBlocksVertexAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(
+          Block.setModelBlocksVertexAttributeColorMap,
+        ),
       },
       polyhedron: {
-        getName: Block.modelBlocksPolyhedronAttributeName,
-        setName: Block.setModelBlocksPolyhedronAttributeName,
-        getRange: Block.modelBlocksPolyhedronAttributeRange,
-        setRange: Block.setModelBlocksPolyhedronAttributeRange,
-        getColorMap: Block.modelBlocksPolyhedronAttributeColorMap,
-        setColorMap: Block.setModelBlocksPolyhedronAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Block.modelBlocksPolyhedronAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Block.setModelBlocksPolyhedronAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Block.modelBlocksPolyhedronAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Block.setModelBlocksPolyhedronAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Block.modelBlocksPolyhedronAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(
+          Block.setModelBlocksPolyhedronAttributeColorMap,
+        ),
       },
     },
     Corner: {
       vertex: {
-        getName: Corner.modelCornersVertexAttributeName,
-        setName: Corner.setModelCornersVertexAttributeName,
-        getRange: Corner.modelCornersVertexAttributeRange,
-        setRange: Corner.setModelCornersVertexAttributeRange,
-        getColorMap: Corner.modelCornersVertexAttributeColorMap,
-        setColorMap: Corner.setModelCornersVertexAttributeColorMap,
+        getName: attributeFn<AttributeNameFn>(Corner.modelCornersVertexAttributeName),
+        setName: attributeFn<SetAttributeNameFn>(Corner.setModelCornersVertexAttributeName),
+        getRange: attributeFn<AttributeRangeFn>(Corner.modelCornersVertexAttributeRange),
+        setRange: attributeFn<SetAttributeRangeFn>(Corner.setModelCornersVertexAttributeRange),
+        getColorMap: attributeFn<AttributeColorMapFn>(Corner.modelCornersVertexAttributeColorMap),
+        setColorMap: attributeFn<SetAttributeColorMapFn>(
+          Corner.setModelCornersVertexAttributeColorMap,
+        ),
       },
     },
   };
   function getModelComponentColor(modelId: string, componentId: string): unknown {
-    return (
-      dataStyleState.getComponentStyle(modelId, componentId).coloring as StyleValues | undefined
-    )?.constant;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const coloring = dataStyleState.getComponentStyle(modelId, componentId).coloring as StyleValues;
+    return coloring.constant;
   }
   function modelComponentTypeColor(modelId: string, type: string): unknown {
-    return (
-      (dataStyleState.getModelComponentTypeStyle(modelId, type).coloring as StyleValues | undefined)
-        ?.constant ||
-      (
-        (dataStyleState.getStyle(modelId)[`${type.toLowerCase()}s`] as StyleValues)
-          .coloring as StyleValues
-      ).constant
-    );
+    const groupStyle = dataStyleState.getModelComponentTypeStyle(modelId, type);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const groupColoring = groupStyle.coloring as StyleValues;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- style values are stored as loosely-typed StyleValues records; see StyleValues definition.
+    const typeStyle = dataStyleState.getStyle(modelId)[`${type.toLowerCase()}s`] as StyleValues;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const typeColoring = typeStyle.coloring as StyleValues;
+    return groupColoring.constant ?? typeColoring.constant;
   }
   function getModelComponentEffectiveColor(
     modelId: string,
@@ -116,33 +188,33 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
     return modelComponentTypeColor(modelId, type);
   }
   function getModelComponentActiveColoring(modelId: string, componentId: string): unknown {
-    return (
-      dataStyleState.getComponentStyle(modelId, componentId).coloring as StyleValues | undefined
-    )?.active;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const coloring = dataStyleState.getComponentStyle(modelId, componentId).coloring as StyleValues;
+    return coloring.active;
   }
   function getModelComponentTypeActiveColoring(modelId: string, type: string): unknown {
-    return (
-      (dataStyleState.getModelComponentTypeStyle(modelId, type).coloring as StyleValues | undefined)
-        ?.active ||
-      (
-        (dataStyleState.getStyle(modelId)[`${type.toLowerCase()}s`] as StyleValues)
-          .coloring as StyleValues
-      ).active
-    );
+    const groupStyle = dataStyleState.getModelComponentTypeStyle(modelId, type);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const groupColoring = groupStyle.coloring as StyleValues;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- style values are stored as loosely-typed StyleValues records; see StyleValues definition.
+    const typeStyle = dataStyleState.getStyle(modelId)[`${type.toLowerCase()}s`] as StyleValues;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
+    const typeColoring = typeStyle.coloring as StyleValues;
+    return groupColoring.active ?? typeColoring.active;
   }
   async function setModelComponentsColor(
     modelId: string,
     componentIds: string[],
     color: unknown,
     activeColoring = "constant",
-  ) {
+  ): Promise<unknown[]> {
     await modelCommonStyle.mutateComponentStyles(modelId, componentIds, {
       coloring: {
         constant: color,
         active: activeColoring,
       },
     });
-    return await dispatchToComponentTypes(
+    return dispatchToComponentTypes(
       modelId,
       componentIds,
       "Color",
@@ -153,7 +225,11 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
       activeColoring,
     );
   }
-  async function setModelComponentTypeColor(modelId: string, type: string, color: unknown) {
+  async function setModelComponentTypeColor(
+    modelId: string,
+    type: string,
+    color: unknown,
+  ): Promise<void> {
     await modelCommonStyle.mutateModelComponentTypeStyle(modelId, type, {
       coloring: {
         constant: color,
@@ -170,7 +246,7 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
     modelId: string,
     type: string,
     activeColoring: string,
-  ) {
+  ): Promise<void> {
     await modelCommonStyle.mutateModelComponentTypeStyle(modelId, type, {
       coloring: {
         active: activeColoring,
@@ -189,17 +265,24 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
         active: activeColoring,
       },
     });
-    const { getName, setName, getRange, setRange, getColorMap, setColorMap } =
-      ATTRIBUTE_FUNCTIONS[type]![activeColoring]!;
-    const name = getName(modelId, idsForType[0]!);
-    if (name) {
+    const attributeFunctions = ATTRIBUTE_FUNCTIONS[type]?.[activeColoring];
+    if (attributeFunctions === undefined) {
+      return;
+    }
+    const { getName, setName, getRange, setRange, getColorMap, setColorMap } = attributeFunctions;
+    const [firstId] = idsForType;
+    if (firstId === undefined) {
+      return;
+    }
+    const name = getName(modelId, firstId);
+    if (name !== undefined && name !== "") {
       await setName(modelId, idsForType, name);
-      const [minimum, maximum] = getRange(modelId, idsForType[0]!);
+      const [minimum, maximum] = getRange(modelId, firstId);
       if (minimum !== undefined && maximum !== undefined) {
         await setRange(modelId, idsForType, minimum, maximum);
       }
-      const colorMap = getColorMap(modelId, idsForType[0]!);
-      if (colorMap) {
+      const colorMap = getColorMap(modelId, firstId);
+      if (colorMap !== undefined && colorMap !== "") {
         await setColorMap(modelId, idsForType, colorMap);
       }
     }
@@ -208,7 +291,7 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
     modelId: string,
     componentId: string,
     activeColoring: string,
-  ) {
+  ): Promise<void> {
     await modelCommonStyle.mutateComponentStyle(modelId, componentId, {
       coloring: {
         active: activeColoring,
@@ -222,25 +305,30 @@ function useModelColorStyle(componentStyleFunctions: ComponentStyleFunctions) {
     if (type === undefined) {
       return;
     }
-    const { getName, setName, getRange, setRange, getColorMap, setColorMap } =
-      ATTRIBUTE_FUNCTIONS[type]![activeColoring]!;
+    const attributeFunctions = ATTRIBUTE_FUNCTIONS[type]?.[activeColoring];
+    if (attributeFunctions === undefined) {
+      return;
+    }
+    const { getName, setName, getRange, setRange, getColorMap, setColorMap } = attributeFunctions;
     const name = getName(modelId, componentId);
-    if (name) {
+    if (name !== undefined && name !== "") {
       await setName(modelId, [componentId], name);
       const [minimum, maximum] = getRange(modelId, componentId);
       if (minimum !== undefined && maximum !== undefined) {
         await setRange(modelId, [componentId], minimum, maximum);
       }
       const colorMap = getColorMap(modelId, componentId);
-      if (colorMap) {
+      if (colorMap !== undefined && colorMap !== "") {
         await setColorMap(modelId, [componentId], colorMap);
       }
     }
   }
   function getModelColor(modelId: string): unknown {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return (dataStyleState.getStyle(modelId).coloring as StyleValues).constant;
   }
   function getModelActiveColoring(modelId: string): unknown {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return (dataStyleState.getStyle(modelId).coloring as StyleValues).active;
   }
   return {
diff --git a/internal/stores/data_style/model/common.ts b/internal/stores/data_style/model/common.ts
index eaa81e6c..5c2870d4 100644
--- a/internal/stores/data_style/model/common.ts
+++ b/internal/stores/data_style/model/common.ts
@@ -1,12 +1,10 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { Dexie, Table } from "dexie";
 import type {
   ModelComponentStyle,
   ModelComponentTypeStyle,
   StyleValues,
 } from "@ogw_internal/stores/data_style/types.js";
 import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
-import type { Dexie, Table } from "dexie";
 import { database } from "@ogw_internal/database/database";
 import merge from "lodash/merge";
 import { useDataStore } from "@ogw_front/stores/data";
@@ -24,20 +22,61 @@ interface ComponentStyleUpdate {
   values: StyleValues;
 }
 
+interface UseModelCommonStyleReturn {
+  mutateComponentStyle: (
+    id_model: string,
+    id_component: string,
+    values: StyleValues,
+  ) => Promise<unknown>;
+  mutateModelComponentTypeStyle: (
+    id_model: string,
+    type: string,
+    values: StyleValues,
+  ) => Promise<void>;
+  mutateComponentStyles: (
+    id_model: string,
+    id_components: string[],
+    values: StyleValues,
+  ) => Promise<void>;
+  bulkMutateComponentStylesPerComponent: (
+    id_model: string,
+    component_updates: ComponentStyleUpdate[],
+  ) => Promise<void>;
+  setModelTypeColor: (
+    id: string,
+    component_ids: string[],
+    color: unknown,
+    schema: JsonRpcSchema,
+    activeColoring?: string,
+  ) => Promise<unknown>;
+  setModelTypeVisibility: (
+    id: string,
+    component_ids: string[],
+    visibility: boolean | undefined,
+    schema: JsonRpcSchema,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-export function useModelCommonStyle() {
+export function useModelCommonStyle(): UseModelCommonStyleReturn {
   const dataStore = useDataStore();
   const viewerStore = useViewerStore();
   const dataStyleState = useDataStyleState();
   const model_component_datastyle_db =
+    // oxlint-disable-next-line no-unsafe-type-assertion -- compound-key table cast; see comment above.
     database.model_component_datastyle as unknown as ComponentTable;
   const model_component_type_datastyle_db =
+    // oxlint-disable-next-line no-unsafe-type-assertion -- compound-key table cast; see comment above.
     database.model_component_type_datastyle as unknown as ComponentTypeTable;
 
-  async function mutateComponentStyle(id_model: string, id_component: string, values: StyleValues) {
+  async function mutateComponentStyle(
+    id_model: string,
+    id_component: string,
+    values: StyleValues,
+  ): Promise<unknown> {
     dataStyleState.updateComponentStyleCache(id_model, id_component, values);
     const key: [string, string] = [id_model, id_component];
-    const entry: ModelComponentStyle = (await model_component_datastyle_db.get(key)) || {
+    const entry: ModelComponentStyle = (await model_component_datastyle_db.get(key)) ?? {
       id_model,
       id_component,
     };
@@ -49,8 +88,9 @@ export function useModelCommonStyle() {
     id_model: string,
     type: string,
     values: StyleValues,
-  ) {
+  ): Promise<void> {
     dataStyleState.updateModelComponentTypeStyleCache(id_model, type, values);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- the shared database proxy types every table as Dexie; see comment above.
     await (database as unknown as Dexie).transaction(
       "rw",
       model_component_type_datastyle_db,
@@ -58,7 +98,7 @@ export function useModelCommonStyle() {
         const key: [string, string] = [id_model, type];
         const entry: ModelComponentTypeStyle = (await model_component_type_datastyle_db.get(
           key,
-        )) || {
+        )) ?? {
           id_model,
           type,
         };
@@ -72,8 +112,9 @@ export function useModelCommonStyle() {
     id_model: string,
     id_components: string[],
     values: StyleValues,
-  ) {
+  ): Promise<void> {
     dataStyleState.bulkUpdateComponentStylesCache(id_model, id_components, values);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- the shared database proxy types every table as Dexie; see comment above.
     await (database as unknown as Dexie).transaction(
       "rw",
       model_component_datastyle_db,
@@ -84,7 +125,7 @@ export function useModelCommonStyle() {
         ]);
         const existing = await model_component_datastyle_db.bulkGet(keys);
         const updates = id_components.map((id_component, index) => {
-          const style: ModelComponentStyle = existing[index] || { id_model, id_component };
+          const style: ModelComponentStyle = existing[index] ?? { id_model, id_component };
           merge(style, values);
           return toRaw(style);
         });
@@ -97,8 +138,9 @@ export function useModelCommonStyle() {
   async function bulkMutateComponentStylesPerComponent(
     id_model: string,
     component_updates: ComponentStyleUpdate[],
-  ) {
+  ): Promise<void> {
     dataStyleState.bulkUpdateComponentStyleCache(id_model, component_updates);
+    // oxlint-disable-next-line no-unsafe-type-assertion -- the shared database proxy types every table as Dexie; see comment above.
     await (database as unknown as Dexie).transaction(
       "rw",
       model_component_datastyle_db,
@@ -109,7 +151,7 @@ export function useModelCommonStyle() {
         ]);
         const existing = await model_component_datastyle_db.bulkGet(keys);
         const updates = component_updates.map(({ id_component, values }, index) => {
-          const style: ModelComponentStyle = existing[index] || { id_model, id_component };
+          const style: ModelComponentStyle = existing[index] ?? { id_model, id_component };
           merge(style, values);
           return toRaw(style);
         });
@@ -124,14 +166,14 @@ export function useModelCommonStyle() {
     color: unknown,
     schema: JsonRpcSchema,
     activeColoring = "constant",
-  ) {
+  ): Promise<unknown> {
     if (!component_ids?.length) {
-      return;
+      return undefined;
     }
 
     const viewer_ids = await dataStore.getMeshComponentsViewerIds(id, component_ids);
     if (!viewer_ids?.length) {
-      return;
+      return undefined;
     }
 
     const params: Record<string, unknown> = {
@@ -152,6 +194,7 @@ export function useModelCommonStyle() {
       { schema, params },
       {
         response_function: async (response: unknown) => {
+          // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the color-set schema.
           const colors = response as { geode_id: string; color: unknown }[] | undefined;
           if (activeColoring === "constant") {
             await mutateComponentStyles(id, component_ids, {
@@ -162,7 +205,7 @@ export function useModelCommonStyle() {
             return;
           }
 
-          if (!colors?.length) {
+          if (colors === undefined || colors.length === 0) {
             return;
           }
 
@@ -187,22 +230,25 @@ export function useModelCommonStyle() {
     component_ids: string[],
     visibility: boolean | undefined,
     schema: JsonRpcSchema,
-  ) {
+  ): Promise<unknown> {
     if (!component_ids?.length) {
-      return;
+      return undefined;
     }
 
     const viewer_ids = await dataStore.getMeshComponentsViewerIds(id, component_ids);
     if (!viewer_ids?.length) {
-      return;
+      return undefined;
     }
     const params = { id, block_ids: viewer_ids, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       { schema, params },
       {
-        response_function: () => mutateComponentStyles(id, component_ids, { visibility }),
+        response_function: async () => {
+          await mutateComponentStyles(id, component_ids, { visibility });
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/model/corners/color.ts b/internal/stores/data_style/model/corners/color.ts
index 16915adc..541d87ff 100644
--- a/internal/stores/data_style/model/corners/color.ts
+++ b/internal/stores/data_style/model/corners/color.ts
@@ -1,19 +1,35 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { isModelCornersVertexAttributeValid, useModelCornersVertexAttribute } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelCornersCommonStyle } from "./common";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.corners.color;
 
-export function useModelCornersColor() {
+interface ModelCornersColorApi {
+  setModelCornersColor: (
+    modelId: string,
+    corners_ids: string[],
+    color: unknown,
+    activeColoring?: string,
+  ) => Promise<unknown>;
+  modelCornerColoring: (id: string, corner_id?: string) => StyleValues;
+  modelCornerColor: (id: string, corner_id?: string) => unknown;
+  modelCornerActiveColoring: (id: string, corner_id?: string) => unknown;
+  setModelCornersActiveColoring: (
+    modelId: string,
+    corners_ids: string[],
+    activeColoring: string,
+  ) => Promise<unknown>;
+}
+
+export function useModelCornersColor(): ModelCornersColorApi {
   const modelCommonStyle = useModelCommonStyle();
   const modelCornersCommonStyle = useModelCornersCommonStyle();
   const modelCornersVertexAttribute = useModelCornersVertexAttribute();
 
   function modelCornerColoring(id: string, corner_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring is a StyleValues sub-object stored under a StyleValues index signature.
     return modelCornersCommonStyle.modelCornerStyle(id, corner_id).coloring as StyleValues;
   }
 
@@ -21,13 +37,20 @@ export function useModelCornersColor() {
     return modelCornerColoring(id, corner_id).constant;
   }
 
-  function setModelCornersColor(
+  async function setModelCornersColor(
     modelId: string,
     corners_ids: string[],
     color: unknown,
     activeColoring = "constant",
-  ) {
-    return modelCommonStyle.setModelTypeColor(modelId, corners_ids, color, schema, activeColoring);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeColor(
+      modelId,
+      corners_ids,
+      color,
+      schema,
+      activeColoring,
+    );
+    return result;
   }
 
   function modelCornerActiveColoring(id: string, corner_id?: string): unknown {
@@ -38,9 +61,9 @@ export function useModelCornersColor() {
     modelId: string,
     corners_ids: string[],
     activeColoring: string,
-  ) {
+  ): Promise<unknown> {
     if (corners_ids.length > 1) {
-      modelCornersCommonStyle.mutateModelCornersTypeColoring(modelId, {
+      await modelCornersCommonStyle.mutateModelCornersTypeColoring(modelId, {
         active: activeColoring,
       });
     }
@@ -78,6 +101,7 @@ export function useModelCornersColor() {
         );
       }
     }
+    return undefined;
   }
 
   return {
diff --git a/internal/stores/data_style/model/corners/common.ts b/internal/stores/data_style/model/corners/common.ts
index 9f83714c..b715120d 100644
--- a/internal/stores/data_style/model/corners/common.ts
+++ b/internal/stores/data_style/model/corners/common.ts
@@ -3,12 +3,26 @@ import merge from "lodash/merge";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 
-export function useModelCornersCommonStyle() {
+export function useModelCornersCommonStyle(): {
+  modelCornersStyle: (id: string) => StyleValues;
+  modelCornerStyle: (id: string, corner_id?: string) => StyleValues;
+  modelCornerColoring: (id: string, corner_id?: string) => StyleValues;
+  mutateModelCornersColoring: (
+    id: string,
+    corners_ids: string[],
+    values: StyleValues,
+  ) => Promise<void>;
+  mutateModelCornersTypeColoring: (id: string, values: StyleValues) => Promise<void>;
+} {
   const dataStyleState = useDataStyleState();
   const modelCommonStyle = useModelCommonStyle();
 
   function modelCornersStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).corners as StyleValues;
+    const { corners } = dataStyleState.getStyle(id);
+    if (corners === undefined) {
+      return {};
+    }
+    return corners;
   }
 
   function modelComponentTypeCornersStyle(id: string): StyleValues {
@@ -27,17 +41,22 @@ export function useModelCornersCommonStyle() {
   }
 
   function modelCornerColoring(id: string, corner_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring is a StyleValues sub-object stored under a StyleValues index signature.
     return modelCornerStyle(id, corner_id).coloring as StyleValues;
   }
 
-  function mutateModelCornersColoring(id: string, corners_ids: string[], values: StyleValues) {
-    return modelCommonStyle.mutateComponentStyles(id, corners_ids, {
+  async function mutateModelCornersColoring(
+    id: string,
+    corners_ids: string[],
+    values: StyleValues,
+  ): Promise<void> {
+    await modelCommonStyle.mutateComponentStyles(id, corners_ids, {
       coloring: values,
     });
   }
 
-  function mutateModelCornersTypeColoring(id: string, values: StyleValues) {
-    return modelCommonStyle.mutateModelComponentTypeStyle(id, "Corner", {
+  async function mutateModelCornersTypeColoring(id: string, values: StyleValues): Promise<void> {
+    await modelCommonStyle.mutateModelComponentTypeStyle(id, "Corner", {
       coloring: values,
     });
   }
diff --git a/internal/stores/data_style/model/corners/index.ts b/internal/stores/data_style/model/corners/index.ts
index 13c1510d..c444bbe2 100644
--- a/internal/stores/data_style/model/corners/index.ts
+++ b/internal/stores/data_style/model/corners/index.ts
@@ -18,41 +18,57 @@ interface AttributeGroup {
   corners_ids: string[];
 }
 
-async function setModelCornersDefaultStyle(_id: string) {
+async function setModelCornersDefaultStyle(_id: string): Promise<void> {
   // Placeholder
 }
 
-export function useModelCornersStyle() {
+type ModelCornersStyleApi = ReturnType<typeof useModelCornersCommonStyle> &
+  ReturnType<typeof useModelCornersVisibility> &
+  ReturnType<typeof useModelCornersColor> &
+  ReturnType<typeof useModelCornersVertexAttribute> & {
+    applyModelCornersStyle: (modelId: string) => Promise<void>;
+    setModelCornersDefaultStyle: (id: string) => Promise<void>;
+  };
+
+export function useModelCornersStyle(): ModelCornersStyleApi {
   const dataStore = useDataStore();
   const modelCommonStyle = useModelCornersCommonStyle();
   const modelVisibilityStyle = useModelCornersVisibility();
   const modelColorStyle = useModelCornersColor();
   const modelCornersVertexAttribute = useModelCornersVertexAttribute();
 
-  function applyModelCornersVisibilityStyle(modelId: string, corners_ids: string[]) {
+  async function applyModelCornersVisibilityStyle(
+    modelId: string,
+    corners_ids: string[],
+  ): Promise<unknown[]> {
     const visibilityGroups: Record<string, string[]> = {};
     for (const corner_id of corners_ids) {
       const style = modelCommonStyle.modelCornerStyle(modelId, corner_id);
       const visibility = String(style.visibility);
-      if (!visibilityGroups[visibility]) {
-        visibilityGroups[visibility] = [];
-      }
+      visibilityGroups[visibility] ??= [];
       visibilityGroups[visibility].push(corner_id);
     }
-    return Promise.all(
-      Object.entries(visibilityGroups).map(([visibility, ids]) =>
-        modelVisibilityStyle.setModelCornersVisibility(modelId, ids, visibility === "true"),
-      ),
+    const results = await Promise.all(
+      Object.entries(visibilityGroups).map(async ([visibility, ids]) => {
+        const result = await modelVisibilityStyle.setModelCornersVisibility(
+          modelId,
+          ids,
+          visibility === "true",
+        );
+        return result;
+      }),
     );
+    return results;
   }
 
-  function applyModelCornersColoringStyle(modelId: string, corners_ids: string[]) {
+  async function applyModelCornersColoringStyle(
+    modelId: string,
+    corners_ids: string[],
+  ): Promise<unknown[]> {
     const activeColoringGroups: Record<string, string[]> = {};
     for (const corner_id of corners_ids) {
       const activeColoring = String(modelColorStyle.modelCornerActiveColoring(modelId, corner_id));
-      if (!activeColoringGroups[activeColoring]) {
-        activeColoringGroups[activeColoring] = [];
-      }
+      activeColoringGroups[activeColoring] ??= [];
       activeColoringGroups[activeColoring].push(corner_id);
     }
 
@@ -64,15 +80,19 @@ export function useModelCornersStyle() {
         for (const corner_id of type_corners_ids) {
           const color = modelColorStyle.modelCornerColor(modelId, corner_id);
           const color_key = JSON.stringify(color);
-          if (!colorGroups[color_key]) {
-            colorGroups[color_key] = { color, corners_ids: [] };
-          }
+          colorGroups[color_key] ??= { color, corners_ids: [] };
           colorGroups[color_key].corners_ids.push(corner_id);
         }
         coloringPromises.push(
-          ...Object.values(colorGroups).map(({ color, corners_ids: ids }) =>
-            modelColorStyle.setModelCornersColor(modelId, ids, color, "constant"),
-          ),
+          ...Object.values(colorGroups).map(async ({ color, corners_ids: ids }) => {
+            const result = await modelColorStyle.setModelCornersColor(
+              modelId,
+              ids,
+              color,
+              "constant",
+            );
+            return result;
+          }),
         );
       } else if (type === "random") {
         coloringPromises.push(
@@ -102,43 +122,48 @@ export function useModelCornersStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!vertexGroups[key]) {
-            vertexGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              corners_ids: [],
-            };
-          }
+          vertexGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            corners_ids: [],
+          };
           vertexGroups[key].corners_ids.push(corner_id);
         }
         coloringPromises.push(
           ...Object.values(vertexGroups).map(
-            ({ name, item, minimum, maximum, colorMap, corners_ids: ids }) =>
-              modelCornersVertexAttribute.setModelCornersVertexAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, corners_ids: ids }) => {
+              const result = await modelCornersVertexAttribute.setModelCornersVertexAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       }
     }
 
-    return Promise.all(coloringPromises);
+    const results = await Promise.all(coloringPromises);
+    return results;
   }
 
-  async function applyModelCornersStyle(modelId: string) {
+  async function applyModelCornersStyle(modelId: string): Promise<void> {
     const corners_ids = await dataStore.getCornersGeodeIds(modelId);
     if (corners_ids.length === 0) {
       return;
     }
 
-    return Promise.all([
+    await Promise.all([
       applyModelCornersVisibilityStyle(modelId, corners_ids),
       applyModelCornersColoringStyle(modelId, corners_ids),
     ]);
diff --git a/internal/stores/data_style/model/corners/vertex.ts b/internal/stores/data_style/model/corners/vertex.ts
index adb2b3a7..625a0ec5 100644
--- a/internal/stores/data_style/model/corners/vertex.ts
+++ b/internal/stores/data_style/model/corners/vertex.ts
@@ -33,6 +33,40 @@ interface AttributeInput {
   no_data_color?: unknown;
 }
 
+type IdsFn<Value> = (modelId: string, cornerIds: string[], value: Value) => Promise<void>;
+
+interface ModelCornersVertexAttributeApi {
+  modelCornersVertexAttributeName: (modelId: string, cornerId?: string) => string | undefined;
+  modelCornersVertexAttributeItem: (modelId: string, cornerId?: string) => number;
+  modelCornersVertexAttributeRange: (
+    modelId: string,
+    cornerId?: string,
+  ) => [number | undefined, number | undefined];
+  modelCornersVertexAttributeColorMap: (modelId: string, cornerId?: string) => string | undefined;
+  modelCornersVertexAttributeStoredConfig: (
+    modelId: string,
+    cornerId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelCornersVertexAttribute: (
+    modelId: string,
+    cornerIds: string[],
+    attribute: AttributeInput,
+  ) => Promise<unknown>;
+  setModelCornersVertexAttributeName: IdsFn<string>;
+  setModelCornersVertexAttributeItem: IdsFn<number>;
+  setModelCornersVertexAttributeRange: (
+    modelId: string,
+    cornerIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<void>;
+  setModelCornersVertexAttributeColorMap: IdsFn<string | undefined>;
+  modelCornersVertexAttributeNoDataColor: (modelId: string, cornerId?: string) => unknown;
+  setModelCornersVertexAttributeNoDataColor: IdsFn<unknown>;
+}
+
 function isModelCornersVertexAttributeValid({
   name,
   item,
@@ -50,11 +84,12 @@ function isModelCornersVertexAttributeValid({
 }
 
 // oxlint-disable-next-line max-lines-per-function
-function useModelCornersVertexAttribute() {
+function useModelCornersVertexAttribute(): ModelCornersVertexAttributeApi {
   const dataStore = useDataStore();
   const modelCornersCommonStyle = useModelCornersCommonStyle();
   const viewerStore = useViewerStore();
   function modelCornersVertexAttribute(modelId: string, cornerId?: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- vertex is a StyleValues sub-object stored under a StyleValues index signature.
     return modelCornersCommonStyle.modelCornerColoring(modelId, cornerId).vertex as AttributeState;
   }
   function modelCornersVertexAttributeStoredConfig(
@@ -63,15 +98,12 @@ function useModelCornersVertexAttribute() {
     name: string | undefined,
     item: number | undefined,
   ): AttributeStoredConfig {
-    const { storedConfigs } = modelCornersVertexAttribute(modelId, cornerId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const storedConfig =
+      name !== undefined && item !== undefined
+        ? modelCornersVertexAttribute(modelId, cornerId).storedConfigs?.[name]?.[item]
+        : undefined;
+    if (storedConfig !== undefined) {
+      return storedConfig;
     }
     return {
       minimum: undefined,
@@ -80,34 +112,35 @@ function useModelCornersVertexAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelCornersVertexStyle(
+  async function mutateModelCornersVertexStyle(
     modelId: string,
     cornerIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (cornerIds.length > 1) {
-      modelCornersCommonStyle.mutateModelCornersTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelCornersCommonStyle.mutateModelCornersColoring(modelId, cornerIds, {
         vertex: values,
-      });
+      }),
+    ];
+    if (cornerIds.length > 1) {
+      tasks.push(
+        modelCornersCommonStyle.mutateModelCornersTypeColoring(modelId, { vertex: values }),
+      );
     }
-    return modelCornersCommonStyle.mutateModelCornersColoring(modelId, cornerIds, {
-      vertex: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelCornersVertexAttributeStoredConfig(
+  async function setModelCornersVertexAttributeStoredConfig(
     modelId: string,
     cornerIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelCornersVertexStyle(modelId, cornerIds, {
-      storedConfigs: {
-        [name as string]: {
-          lastItem: item,
-          [item as number]: config,
-        },
-      },
+  ): Promise<void> {
+    if (name === undefined || item === undefined) {
+      return;
+    }
+    await mutateModelCornersVertexStyle(modelId, cornerIds, {
+      storedConfigs: { [name]: { lastItem: item, [item]: config } },
     });
   }
   function modelCornersVertexAttributeName(modelId: string, cornerId?: string): string | undefined {
@@ -118,11 +151,11 @@ function useModelCornersVertexAttribute() {
     cornerId: string | undefined,
     name: string | undefined,
   ): number {
-    const { storedConfigs } = modelCornersVertexAttribute(modelId, cornerId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    if (name === undefined) {
+      return 0;
     }
-    return 0;
+    const { storedConfigs } = modelCornersVertexAttribute(modelId, cornerId);
+    return storedConfigs?.[name]?.lastItem ?? 0;
   }
   function modelCornersVertexAttributeItem(modelId: string, cornerId?: string): number {
     const vertexAttribute = modelCornersVertexAttribute(modelId, cornerId);
@@ -137,8 +170,12 @@ function useModelCornersVertexAttribute() {
   ): [number | undefined, number | undefined] {
     const name = modelCornersVertexAttributeName(modelId, cornerId);
     const item = modelCornersVertexAttributeItem(modelId, cornerId);
-    const storedConfig = modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item);
-    const { minimum, maximum } = storedConfig;
+    const { minimum, maximum } = modelCornersVertexAttributeStoredConfig(
+      modelId,
+      cornerId,
+      name,
+      item,
+    );
     return [minimum, maximum];
   }
   function modelCornersVertexAttributeColorMap(
@@ -147,8 +184,7 @@ function useModelCornersVertexAttribute() {
   ): string | undefined {
     const name = modelCornersVertexAttributeName(modelId, cornerId);
     const item = modelCornersVertexAttributeItem(modelId, cornerId);
-    const storedConfig = modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item);
-    return storedConfig.colorMap;
+    return modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item).colorMap;
   }
   async function setModelCornersVertexAttribute(
     modelId: string,
@@ -161,18 +197,15 @@ function useModelCornersVertexAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelCornersVertexStyle(modelId, cornerIds, {
-      name,
-      item,
-    });
-    setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
+  ): Promise<unknown> {
+    await mutateModelCornersVertexStyle(modelId, cornerIds, { name, item });
+    await setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const corner_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, cornerIds);
     const params = {
       id: modelId,
@@ -184,12 +217,10 @@ function useModelCornersVertexAttribute() {
       maximum,
       no_data_color,
     };
-    return viewerStore.request({
-      schema: attributeSchema,
-      params,
-    });
+    const result = await viewerStore.request({ schema: attributeSchema, params });
+    return result;
   }
-  function applyVertexAttribute(modelId: string, cornerIds: string[]) {
+  async function applyVertexAttribute(modelId: string, cornerIds: string[]): Promise<void> {
     const name = modelCornersVertexAttributeName(modelId, cornerIds[0]);
     const item = modelCornersVertexAttributeItem(modelId, cornerIds[0]);
     const storedConfig = modelCornersVertexAttributeStoredConfig(modelId, cornerIds[0], name, item);
@@ -202,61 +233,60 @@ function useModelCornersVertexAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelCornersVertexAttributeValid(attribute)) {
-      return setModelCornersVertexAttribute(modelId, cornerIds, attribute);
+      await setModelCornersVertexAttribute(modelId, cornerIds, attribute);
     }
-    return Promise.resolve();
   }
-  function setModelCornersVertexAttributeName(modelId: string, cornerIds: string[], name: string) {
+  async function setModelCornersVertexAttributeName(
+    modelId: string,
+    cornerIds: string[],
+    name: string,
+  ): Promise<void> {
     const item = modelCornersVertexAttributeLastItem(modelId, cornerIds[0], name);
-    mutateModelCornersVertexStyle(modelId, cornerIds, {
-      name,
-      item,
-    });
-    return applyVertexAttribute(modelId, cornerIds);
+    await mutateModelCornersVertexStyle(modelId, cornerIds, { name, item });
+    await applyVertexAttribute(modelId, cornerIds);
   }
-  function setModelCornersVertexAttributeItem(modelId: string, cornerIds: string[], item: number) {
-    mutateModelCornersVertexStyle(modelId, cornerIds, {
-      item,
-    });
-    return applyVertexAttribute(modelId, cornerIds);
+  async function setModelCornersVertexAttributeItem(
+    modelId: string,
+    cornerIds: string[],
+    item: number,
+  ): Promise<void> {
+    await mutateModelCornersVertexStyle(modelId, cornerIds, { item });
+    await applyVertexAttribute(modelId, cornerIds);
   }
-  function setModelCornersVertexAttributeRange(
+  async function setModelCornersVertexAttributeRange(
     modelId: string,
     cornerIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<void> {
     const name = modelCornersVertexAttributeName(modelId, cornerIds[0]);
     const item = modelCornersVertexAttributeItem(modelId, cornerIds[0]);
-    setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
+    await setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
       minimum,
       maximum,
     });
-    return applyVertexAttribute(modelId, cornerIds);
+    await applyVertexAttribute(modelId, cornerIds);
   }
-  function setModelCornersVertexAttributeColorMap(
+  async function setModelCornersVertexAttributeColorMap(
     modelId: string,
     cornerIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<void> {
     const name = modelCornersVertexAttributeName(modelId, cornerIds[0]);
     const item = modelCornersVertexAttributeItem(modelId, cornerIds[0]);
-    setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
-      colorMap,
-    });
-    return applyVertexAttribute(modelId, cornerIds);
+    await setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, { colorMap });
+    await applyVertexAttribute(modelId, cornerIds);
   }
   function modelCornersVertexAttributeNoDataColor(modelId: string, cornerId?: string): unknown {
     const name = modelCornersVertexAttributeName(modelId, cornerId);
     const item = modelCornersVertexAttributeItem(modelId, cornerId);
-    const storedConfig = modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item);
-    return storedConfig.no_data_color;
+    return modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item).no_data_color;
   }
   async function setModelCornersVertexAttributeNoDataColor(
     modelId: string,
     cornerIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<void> {
     const name = modelCornersVertexAttributeName(modelId, cornerIds[0]);
     const item = modelCornersVertexAttributeItem(modelId, cornerIds[0]);
     const storedConfig = modelCornersVertexAttributeStoredConfig(modelId, cornerIds[0], name, item);
@@ -264,7 +294,7 @@ function useModelCornersVertexAttribute() {
       ...storedConfig,
       no_data_color,
     });
-    return applyVertexAttribute(modelId, cornerIds);
+    await applyVertexAttribute(modelId, cornerIds);
   }
   return {
     modelCornersVertexAttributeName,
diff --git a/internal/stores/data_style/model/corners/visibility.ts b/internal/stores/data_style/model/corners/visibility.ts
index 4e063181..ea806939 100644
--- a/internal/stores/data_style/model/corners/visibility.ts
+++ b/internal/stores/data_style/model/corners/visibility.ts
@@ -4,7 +4,16 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.corners.visibility;
 
-export function useModelCornersVisibility() {
+interface ModelCornersVisibilityApi {
+  setModelCornersVisibility: (
+    modelId: string,
+    corners_ids: string[],
+    visibility: boolean | undefined,
+  ) => Promise<unknown>;
+  modelCornerVisibility: (id: string, corner_id?: string) => unknown;
+}
+
+export function useModelCornersVisibility(): ModelCornersVisibilityApi {
   const modelCommonStyle = useModelCommonStyle();
   const modelCornersCommonStyle = useModelCornersCommonStyle();
 
@@ -12,12 +21,18 @@ export function useModelCornersVisibility() {
     return modelCornersCommonStyle.modelCornerStyle(id, corner_id).visibility;
   }
 
-  function setModelCornersVisibility(
+  async function setModelCornersVisibility(
     modelId: string,
     corners_ids: string[],
     visibility: boolean | undefined,
-  ) {
-    return modelCommonStyle.setModelTypeVisibility(modelId, corners_ids, visibility, schema);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeVisibility(
+      modelId,
+      corners_ids,
+      visibility,
+      schema,
+    );
+    return result;
   }
 
   return { setModelCornersVisibility, modelCornerVisibility };
diff --git a/internal/stores/data_style/model/edges/common.ts b/internal/stores/data_style/model/edges/common.ts
index dc48ce9d..c1d4cf58 100644
--- a/internal/stores/data_style/model/edges/common.ts
+++ b/internal/stores/data_style/model/edges/common.ts
@@ -1,17 +1,25 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useModelEdgesCommonStyle() {
+export function useModelEdgesCommonStyle(): {
+  modelEdgesStyle: (id: string) => StyleValues;
+  mutateModelEdgesStyle: (id: string, values: StyleValues) => Promise<string>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateModelEdgesStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateModelEdgesStyle(id: string, values: StyleValues): Promise<string> {
+    const result = await dataStyleState.mutateStyle(id, {
       edges: values,
     });
+    return result;
   }
 
   function modelEdgesStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).edges as StyleValues;
+    const { edges } = dataStyleState.getStyle(id);
+    if (edges === undefined) {
+      return {};
+    }
+    return edges;
   }
 
   return {
diff --git a/internal/stores/data_style/model/edges/index.ts b/internal/stores/data_style/model/edges/index.ts
index 445bb48e..fc637d90 100644
--- a/internal/stores/data_style/model/edges/index.ts
+++ b/internal/stores/data_style/model/edges/index.ts
@@ -1,7 +1,8 @@
 import { useModelEdgesCommonStyle } from "./common";
 import { useModelEdgesVisibilityStyle } from "./visibility";
 
-export function useModelEdgesStyle() {
+export function useModelEdgesStyle(): ReturnType<typeof useModelEdgesCommonStyle> &
+  ReturnType<typeof useModelEdgesVisibilityStyle> {
   const modelEdgesCommonStyle = useModelEdgesCommonStyle();
   const modelEdgesVisibilityStyle = useModelEdgesVisibilityStyle();
 
diff --git a/internal/stores/data_style/model/edges/visibility.ts b/internal/stores/data_style/model/edges/visibility.ts
index 02eaef8e..8eade697 100644
--- a/internal/stores/data_style/model/edges/visibility.ts
+++ b/internal/stores/data_style/model/edges/visibility.ts
@@ -7,27 +7,44 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.model.edges.visibility;
 
-export function useModelEdgesVisibilityStyle() {
+interface ModelEdgesVisibilityStyleApi {
+  modelEdgesVisibility: (id: string) => boolean | undefined;
+  setModelEdgesVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+  applyModelEdgesStyle: (id: string) => Promise<unknown[]>;
+}
+
+export function useModelEdgesVisibilityStyle(): ModelEdgesVisibilityStyleApi {
   const viewerStore = useViewerStore();
   const modelEdgesCommonStyle = useModelEdgesCommonStyle();
 
   function modelEdgesVisibility(id: string): boolean | undefined {
-    return modelEdgesCommonStyle.modelEdgesStyle(id).visibility as boolean | undefined;
+    const { visibility } = modelEdgesCommonStyle.modelEdgesStyle(id);
+    if (typeof visibility === "boolean") {
+      return visibility;
+    }
+    return undefined;
   }
 
-  function setModelEdgesVisibility(id: string, visibility: boolean | undefined) {
+  async function setModelEdgesVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       { schema, params },
       {
-        response_function: () => modelEdgesCommonStyle.mutateModelEdgesStyle(id, { visibility }),
+        response_function: async () => {
+          await modelEdgesCommonStyle.mutateModelEdgesStyle(id, { visibility });
+        },
       },
     );
+    return result;
   }
 
-  function applyModelEdgesStyle(id: string) {
+  async function applyModelEdgesStyle(id: string): Promise<unknown[]> {
     const visibility = modelEdgesVisibility(id);
-    return Promise.resolve([setModelEdgesVisibility(id, visibility)]);
+    const result = await setModelEdgesVisibility(id, visibility);
+    return [result];
   }
 
   return {
diff --git a/internal/stores/data_style/model/index.ts b/internal/stores/data_style/model/index.ts
index 244c04c1..6cae080c 100644
--- a/internal/stores/data_style/model/index.ts
+++ b/internal/stores/data_style/model/index.ts
@@ -1,3 +1,4 @@
+import type { ComputedRef } from "vue";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelBlocksStyle } from "./blocks";
@@ -10,8 +11,21 @@ import { useModelSelection } from "./selection";
 import { useModelSurfacesStyle } from "./surfaces";
 import { useModelVisibilityStyle } from "./visibility";
 
+type UseModelStyleReturn = ReturnType<typeof useModelColorStyle> &
+  ReturnType<typeof useModelVisibilityStyle> &
+  ReturnType<typeof useModelBlocksStyle> &
+  ReturnType<typeof useModelCornersStyle> &
+  ReturnType<typeof useModelEdgesStyle> &
+  ReturnType<typeof useModelLinesStyle> &
+  ReturnType<typeof useModelPointsStyle> &
+  ReturnType<typeof useModelSurfacesStyle> & {
+    visibleMeshComponents: (modelId: string) => ComputedRef<string[]>;
+    applyModelStyle: (modelId: string) => Promise<unknown[]>;
+    setModelMeshComponentsDefaultStyle: (modelId: string) => Promise<unknown[]>;
+  };
+
 // oxlint-disable-next-line max-lines-per-function, max-statements
-function useModelStyle() {
+function useModelStyle(): UseModelStyleReturn {
   const dataStore = useDataStore();
   const dataStyleState = useDataStyleState();
   const modelCornersStyle = useModelCornersStyle();
@@ -31,15 +45,15 @@ function useModelStyle() {
   const modelColorStyle = useModelColorStyle(componentStyleFunctions);
   const modelVisibilityStyle = useModelVisibilityStyle(componentStyleFunctions);
 
-  function visibleMeshComponents(modelId: string) {
+  function visibleMeshComponents(modelId: string): ComputedRef<string[]> {
     return useModelSelection(modelId, dataStyleState);
   }
 
-  function applyModelStyle(modelId: string) {
+  async function applyModelStyle(modelId: string): Promise<unknown[]> {
     const style = dataStyleState.getStyle(modelId);
 
-    return Promise.all([
-      modelVisibilityStyle.setModelVisibility(modelId, style.visibility as boolean),
+    const results = await Promise.all([
+      modelVisibilityStyle.setModelVisibility(modelId, style.visibility ?? false),
       modelBlocksStyle.applyModelBlocksStyle(modelId),
       modelSurfacesStyle.applyModelSurfacesStyle(modelId),
       modelLinesStyle.applyModelLinesStyle(modelId),
@@ -47,19 +61,18 @@ function useModelStyle() {
       modelPointsStyle.applyModelPointsStyle(modelId),
       modelEdgesStyle.applyModelEdgesStyle(modelId),
     ]);
+    return results;
   }
 
-  async function setModelMeshComponentsDefaultStyle(modelId: string) {
-    const item = await dataStore.item(modelId);
-    if (!item) {
-      return;
-    }
-    return await Promise.all([
+  async function setModelMeshComponentsDefaultStyle(modelId: string): Promise<unknown[]> {
+    await dataStore.item(modelId);
+    const results = await Promise.all([
       modelBlocksStyle.setModelBlocksDefaultStyle(modelId),
       modelSurfacesStyle.setModelSurfacesDefaultStyle(modelId),
       modelLinesStyle.setModelLinesDefaultStyle(modelId),
       modelCornersStyle.setModelCornersDefaultStyle(modelId),
     ]);
+    return results;
   }
 
   return {
diff --git a/internal/stores/data_style/model/lines/color.ts b/internal/stores/data_style/model/lines/color.ts
index 47e3ed8e..02cc1862 100644
--- a/internal/stores/data_style/model/lines/color.ts
+++ b/internal/stores/data_style/model/lines/color.ts
@@ -1,21 +1,35 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { isModelLinesEdgeAttributeValid, useModelLinesEdgeAttribute } from "./edge";
 import { isModelLinesVertexAttributeValid, useModelLinesVertexAttribute } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelLinesCommonStyle } from "./common";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.lines.color;
 
-export function useModelLinesColor() {
+export function useModelLinesColor(): {
+  setModelLinesColor: (
+    modelId: string,
+    lines_ids: string[],
+    color: unknown,
+    activeColoring?: string,
+  ) => Promise<unknown>;
+  modelLineColoring: (id: string, line_id?: string) => StyleValues;
+  modelLineColor: (id: string, line_id?: string) => unknown;
+  modelLineActiveColoring: (id: string, line_id?: string) => unknown;
+  setModelLinesActiveColoring: (
+    modelId: string,
+    lines_ids: string[],
+    activeColoring: string,
+  ) => Promise<unknown>;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelLinesCommonStyle = useModelLinesCommonStyle();
   const modelLinesVertexAttribute = useModelLinesVertexAttribute();
   const modelLinesEdgeAttribute = useModelLinesEdgeAttribute();
 
   function modelLineColoring(id: string, line_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelLinesCommonStyle.modelLineStyle(id, line_id).coloring as StyleValues;
   }
 
@@ -23,13 +37,20 @@ export function useModelLinesColor() {
     return modelLineColoring(id, line_id).constant;
   }
 
-  function setModelLinesColor(
+  async function setModelLinesColor(
     modelId: string,
     lines_ids: string[],
     color: unknown,
     activeColoring = "constant",
-  ) {
-    return modelCommonStyle.setModelTypeColor(modelId, lines_ids, color, schema, activeColoring);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeColor(
+      modelId,
+      lines_ids,
+      color,
+      schema,
+      activeColoring,
+    );
+    return result;
   }
 
   function modelLineActiveColoring(id: string, line_id?: string): unknown {
@@ -40,9 +61,9 @@ export function useModelLinesColor() {
     modelId: string,
     lines_ids: string[],
     activeColoring: string,
-  ) {
+  ): Promise<unknown> {
     if (lines_ids.length > 1) {
-      modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
+      await modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
         active: activeColoring,
       });
     }
@@ -89,6 +110,7 @@ export function useModelLinesColor() {
         return modelLinesEdgeAttribute.setModelLinesEdgeAttribute(modelId, lines_ids, attribute);
       }
     }
+    return undefined;
   }
 
   return {
diff --git a/internal/stores/data_style/model/lines/common.ts b/internal/stores/data_style/model/lines/common.ts
index 31b3847e..9ff88baf 100644
--- a/internal/stores/data_style/model/lines/common.ts
+++ b/internal/stores/data_style/model/lines/common.ts
@@ -3,12 +3,18 @@ import merge from "lodash/merge";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 
-export function useModelLinesCommonStyle() {
+export function useModelLinesCommonStyle(): {
+  modelLinesStyle: (id: string) => StyleValues;
+  modelLineStyle: (id: string, line_id?: string) => StyleValues;
+  modelLineColoring: (id: string, line_id?: string) => StyleValues;
+  mutateModelLinesColoring: (id: string, lines_ids: string[], values: StyleValues) => Promise<void>;
+  mutateModelLinesTypeColoring: (id: string, values: StyleValues) => Promise<void>;
+} {
   const dataStyleState = useDataStyleState();
   const modelCommonStyle = useModelCommonStyle();
 
   function modelLinesStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).lines as StyleValues;
+    return dataStyleState.getStyle(id).lines ?? {};
   }
 
   function modelComponentTypeLinesStyle(id: string): StyleValues {
@@ -27,17 +33,22 @@ export function useModelLinesCommonStyle() {
   }
 
   function modelLineColoring(id: string, line_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelLineStyle(id, line_id).coloring as StyleValues;
   }
 
-  function mutateModelLinesColoring(id: string, lines_ids: string[], values: StyleValues) {
-    return modelCommonStyle.mutateComponentStyles(id, lines_ids, {
+  async function mutateModelLinesColoring(
+    id: string,
+    lines_ids: string[],
+    values: StyleValues,
+  ): Promise<void> {
+    await modelCommonStyle.mutateComponentStyles(id, lines_ids, {
       coloring: values,
     });
   }
 
-  function mutateModelLinesTypeColoring(id: string, values: StyleValues) {
-    return modelCommonStyle.mutateModelComponentTypeStyle(id, "Line", {
+  async function mutateModelLinesTypeColoring(id: string, values: StyleValues): Promise<void> {
+    await modelCommonStyle.mutateModelComponentTypeStyle(id, "Line", {
       coloring: values,
     });
   }
diff --git a/internal/stores/data_style/model/lines/edge.ts b/internal/stores/data_style/model/lines/edge.ts
index 4b69d081..1ca94297 100644
--- a/internal/stores/data_style/model/lines/edge.ts
+++ b/internal/stores/data_style/model/lines/edge.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -49,12 +50,61 @@ function isModelLinesEdgeAttributeValid({
   );
 }
 
+interface UseModelLinesEdgeAttributeReturn {
+  modelLinesEdgeAttributeName: (modelId: string, lineId?: string) => string | undefined;
+  modelLinesEdgeAttributeItem: (modelId: string, lineId?: string) => number;
+  modelLinesEdgeAttributeRange: (
+    modelId: string,
+    lineId?: string,
+  ) => [number | undefined, number | undefined];
+  modelLinesEdgeAttributeColorMap: (modelId: string, lineId?: string) => string | undefined;
+  modelLinesEdgeAttributeStoredConfig: (
+    modelId: string,
+    lineId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelLinesEdgeAttribute: (
+    modelId: string,
+    lineIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelLinesEdgeAttributeName: (
+    modelId: string,
+    lineIds: string[],
+    name: string,
+  ) => Promise<unknown>;
+  setModelLinesEdgeAttributeItem: (
+    modelId: string,
+    lineIds: string[],
+    item: number,
+  ) => Promise<unknown>;
+  setModelLinesEdgeAttributeRange: (
+    modelId: string,
+    lineIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setModelLinesEdgeAttributeColorMap: (
+    modelId: string,
+    lineIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  modelLinesEdgeAttributeNoDataColor: (modelId: string, lineId?: string) => unknown;
+  setModelLinesEdgeAttributeNoDataColor: (
+    modelId: string,
+    lineIds: string[],
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelLinesEdgeAttribute() {
+function useModelLinesEdgeAttribute(): UseModelLinesEdgeAttributeReturn {
   const dataStore = useDataStore();
   const modelLinesCommonStyle = useModelLinesCommonStyle();
   const viewerStore = useViewerStore();
   function modelLinesEdgeAttribute(modelId: string, lineId?: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.edge shape is defined by the data style schema.
     return modelLinesCommonStyle.modelLineColoring(modelId, lineId).edge as AttributeState;
   }
   function modelLinesEdgeAttributeStoredConfig(
@@ -64,14 +114,10 @@ function useModelLinesEdgeAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelLinesEdgeAttribute(modelId, lineId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -80,32 +126,40 @@ function useModelLinesEdgeAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelLinesEdgeStyle(
+  async function mutateModelLinesEdgeStyle(
     modelId: string,
     lineIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (lineIds.length > 1) {
-      modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelLinesCommonStyle.mutateModelLinesColoring(modelId, lineIds, {
         edge: values,
-      });
+      }),
+    ];
+    if (lineIds.length > 1) {
+      tasks.push(
+        modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
+          edge: values,
+        }),
+      );
     }
-    return modelLinesCommonStyle.mutateModelLinesColoring(modelId, lineIds, {
-      edge: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelLinesEdgeAttributeStoredConfig(
+  async function setModelLinesEdgeAttributeStoredConfig(
     modelId: string,
     lineIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelLinesEdgeStyle(modelId, lineIds, {
+  ): Promise<void> {
+    if (name === undefined || item === undefined) {
+      return;
+    }
+    await mutateModelLinesEdgeStyle(modelId, lineIds, {
       storedConfigs: {
-        [name as string]: {
+        [name]: {
           lastItem: item,
-          [item as number]: config,
+          [item]: config,
         },
       },
     });
@@ -119,8 +173,9 @@ function useModelLinesEdgeAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelLinesEdgeAttribute(modelId, lineId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -157,18 +212,18 @@ function useModelLinesEdgeAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelLinesEdgeStyle(modelId, lineIds, {
+  ): Promise<unknown> {
+    await mutateModelLinesEdgeStyle(modelId, lineIds, {
       name,
       item,
     });
-    setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const line_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, lineIds);
     const params = {
       id: modelId,
@@ -185,7 +240,7 @@ function useModelLinesEdgeAttribute() {
       params,
     });
   }
-  function applyEdgeAttribute(modelId: string, lineIds: string[]) {
+  async function applyEdgeAttribute(modelId: string, lineIds: string[]): Promise<void> {
     const name = modelLinesEdgeAttributeName(modelId, lineIds[0]);
     const item = modelLinesEdgeAttributeItem(modelId, lineIds[0]);
     const storedConfig = modelLinesEdgeAttributeStoredConfig(modelId, lineIds[0], name, item);
@@ -198,46 +253,53 @@ function useModelLinesEdgeAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelLinesEdgeAttributeValid(attribute)) {
-      return setModelLinesEdgeAttribute(modelId, lineIds, attribute);
+      await setModelLinesEdgeAttribute(modelId, lineIds, attribute);
     }
-    return Promise.resolve();
   }
-  function setModelLinesEdgeAttributeName(modelId: string, lineIds: string[], name: string) {
+  async function setModelLinesEdgeAttributeName(
+    modelId: string,
+    lineIds: string[],
+    name: string,
+  ): Promise<unknown> {
     const item = modelLinesEdgeAttributeLastItem(modelId, lineIds[0], name);
-    mutateModelLinesEdgeStyle(modelId, lineIds, {
+    await mutateModelLinesEdgeStyle(modelId, lineIds, {
       name,
       item,
     });
     return applyEdgeAttribute(modelId, lineIds);
   }
-  function setModelLinesEdgeAttributeItem(modelId: string, lineIds: string[], item: number) {
-    mutateModelLinesEdgeStyle(modelId, lineIds, {
+  async function setModelLinesEdgeAttributeItem(
+    modelId: string,
+    lineIds: string[],
+    item: number,
+  ): Promise<unknown> {
+    await mutateModelLinesEdgeStyle(modelId, lineIds, {
       item,
     });
     return applyEdgeAttribute(modelId, lineIds);
   }
-  function setModelLinesEdgeAttributeRange(
+  async function setModelLinesEdgeAttributeRange(
     modelId: string,
     lineIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesEdgeAttributeName(modelId, lineIds[0]);
     const item = modelLinesEdgeAttributeItem(modelId, lineIds[0]);
-    setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
       minimum,
       maximum,
     });
     return applyEdgeAttribute(modelId, lineIds);
   }
-  function setModelLinesEdgeAttributeColorMap(
+  async function setModelLinesEdgeAttributeColorMap(
     modelId: string,
     lineIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesEdgeAttributeName(modelId, lineIds[0]);
     const item = modelLinesEdgeAttributeItem(modelId, lineIds[0]);
-    setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesEdgeAttributeStoredConfig(modelId, lineIds, name, item, {
       colorMap,
     });
     return applyEdgeAttribute(modelId, lineIds);
@@ -252,7 +314,7 @@ function useModelLinesEdgeAttribute() {
     modelId: string,
     lineIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesEdgeAttributeName(modelId, lineIds[0]);
     const item = modelLinesEdgeAttributeItem(modelId, lineIds[0]);
     const storedConfig = modelLinesEdgeAttributeStoredConfig(modelId, lineIds[0], name, item);
diff --git a/internal/stores/data_style/model/lines/index.ts b/internal/stores/data_style/model/lines/index.ts
index f2caccba..86538645 100644
--- a/internal/stores/data_style/model/lines/index.ts
+++ b/internal/stores/data_style/model/lines/index.ts
@@ -19,12 +19,19 @@ interface AttributeGroup {
   lines_ids: string[];
 }
 
-async function setModelLinesDefaultStyle(_id: string) {
+async function setModelLinesDefaultStyle(_id: string): Promise<void> {
   // Placeholder
 }
 
 // oxlint-disable-next-line max-lines-per-function
-export function useModelLinesStyle() {
+export function useModelLinesStyle(): ReturnType<typeof useModelLinesCommonStyle> &
+  ReturnType<typeof useModelLinesVisibility> &
+  ReturnType<typeof useModelLinesColor> &
+  ReturnType<typeof useModelLinesVertexAttribute> &
+  ReturnType<typeof useModelLinesEdgeAttribute> & {
+    applyModelLinesStyle: (modelId: string) => Promise<void>;
+    setModelLinesDefaultStyle: (id: string) => Promise<void>;
+  } {
   const dataStore = useDataStore();
   const modelCommonStyle = useModelLinesCommonStyle();
   const modelVisibilityStyle = useModelLinesVisibility();
@@ -32,30 +39,37 @@ export function useModelLinesStyle() {
   const modelLinesVertexAttribute = useModelLinesVertexAttribute();
   const modelLinesEdgeAttribute = useModelLinesEdgeAttribute();
 
-  function applyModelLinesVisibilityStyle(modelId: string, lines_ids: string[]) {
+  async function applyModelLinesVisibilityStyle(
+    modelId: string,
+    lines_ids: string[],
+  ): Promise<void> {
     const visibilityGroups: Record<string, string[]> = {};
     for (const line_id of lines_ids) {
       const style = modelCommonStyle.modelLineStyle(modelId, line_id);
       const visibility = String(style.visibility);
-      if (!visibilityGroups[visibility]) {
-        visibilityGroups[visibility] = [];
-      }
+      visibilityGroups[visibility] ??= [];
       visibilityGroups[visibility].push(line_id);
     }
-    return Promise.all(
-      Object.entries(visibilityGroups).map(([visibility, ids]) =>
-        modelVisibilityStyle.setModelLinesVisibility(modelId, ids, visibility === "true"),
-      ),
+    await Promise.all(
+      Object.entries(visibilityGroups).map(async ([visibility, ids]) => {
+        const result = await modelVisibilityStyle.setModelLinesVisibility(
+          modelId,
+          ids,
+          visibility === "true",
+        );
+        return result;
+      }),
     );
   }
 
-  function applyModelLinesColoringStyle(modelId: string, lines_ids: string[]) {
+  async function applyModelLinesColoringStyle(
+    modelId: string,
+    lines_ids: string[],
+  ): Promise<unknown[]> {
     const activeColoringGroups: Record<string, string[]> = {};
     for (const line_id of lines_ids) {
       const activeColoring = String(modelColorStyle.modelLineActiveColoring(modelId, line_id));
-      if (!activeColoringGroups[activeColoring]) {
-        activeColoringGroups[activeColoring] = [];
-      }
+      activeColoringGroups[activeColoring] ??= [];
       activeColoringGroups[activeColoring].push(line_id);
     }
 
@@ -67,15 +81,19 @@ export function useModelLinesStyle() {
         for (const line_id of type_lines_ids) {
           const color = modelColorStyle.modelLineColor(modelId, line_id);
           const color_key = JSON.stringify(color);
-          if (!colorGroups[color_key]) {
-            colorGroups[color_key] = { color, lines_ids: [] };
-          }
+          colorGroups[color_key] ??= { color, lines_ids: [] };
           colorGroups[color_key].lines_ids.push(line_id);
         }
         coloringPromises.push(
-          ...Object.values(colorGroups).map(({ color, lines_ids: ids }) =>
-            modelColorStyle.setModelLinesColor(modelId, ids, color, "constant"),
-          ),
+          ...Object.values(colorGroups).map(async ({ color, lines_ids: ids }) => {
+            const result = await modelColorStyle.setModelLinesColor(
+              modelId,
+              ids,
+              color,
+              "constant",
+            );
+            return result;
+          }),
         );
       } else if (type === "random") {
         coloringPromises.push(
@@ -99,28 +117,32 @@ export function useModelLinesStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!vertexGroups[key]) {
-            vertexGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              lines_ids: [],
-            };
-          }
+          vertexGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            lines_ids: [],
+          };
           vertexGroups[key].lines_ids.push(line_id);
         }
         coloringPromises.push(
           ...Object.values(vertexGroups).map(
-            ({ name, item, minimum, maximum, colorMap, lines_ids: ids }) =>
-              modelLinesVertexAttribute.setModelLinesVertexAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, lines_ids: ids }) => {
+              const result = await modelLinesVertexAttribute.setModelLinesVertexAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       } else if (type === "edge") {
@@ -141,41 +163,46 @@ export function useModelLinesStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!edgeGroups[key]) {
-            edgeGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              lines_ids: [],
-            };
-          }
+          edgeGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            lines_ids: [],
+          };
           edgeGroups[key].lines_ids.push(line_id);
         }
         coloringPromises.push(
           ...Object.values(edgeGroups).map(
-            ({ name, item, minimum, maximum, colorMap, lines_ids: ids }) =>
-              modelLinesEdgeAttribute.setModelLinesEdgeAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, lines_ids: ids }) => {
+              const result = await modelLinesEdgeAttribute.setModelLinesEdgeAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       }
     }
-    return Promise.all(coloringPromises);
+    const results = await Promise.all(coloringPromises);
+    return results;
   }
 
-  async function applyModelLinesStyle(modelId: string) {
+  async function applyModelLinesStyle(modelId: string): Promise<void> {
     const lines_ids = await dataStore.getLinesGeodeIds(modelId);
     if (lines_ids.length === 0) {
       return;
     }
-    return Promise.all([
+    await Promise.all([
       applyModelLinesVisibilityStyle(modelId, lines_ids),
       applyModelLinesColoringStyle(modelId, lines_ids),
     ]);
diff --git a/internal/stores/data_style/model/lines/vertex.ts b/internal/stores/data_style/model/lines/vertex.ts
index ff6893b2..df90e00c 100644
--- a/internal/stores/data_style/model/lines/vertex.ts
+++ b/internal/stores/data_style/model/lines/vertex.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -49,12 +50,61 @@ function isModelLinesVertexAttributeValid({
   );
 }
 
+interface UseModelLinesVertexAttributeReturn {
+  modelLinesVertexAttributeName: (modelId: string, lineId?: string) => string | undefined;
+  modelLinesVertexAttributeItem: (modelId: string, lineId?: string) => number;
+  modelLinesVertexAttributeRange: (
+    modelId: string,
+    lineId?: string,
+  ) => [number | undefined, number | undefined];
+  modelLinesVertexAttributeColorMap: (modelId: string, lineId?: string) => string | undefined;
+  modelLinesVertexAttributeStoredConfig: (
+    modelId: string,
+    lineId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelLinesVertexAttribute: (
+    modelId: string,
+    lineIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelLinesVertexAttributeName: (
+    modelId: string,
+    lineIds: string[],
+    name: string,
+  ) => Promise<unknown>;
+  setModelLinesVertexAttributeItem: (
+    modelId: string,
+    lineIds: string[],
+    item: number,
+  ) => Promise<unknown>;
+  setModelLinesVertexAttributeRange: (
+    modelId: string,
+    lineIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setModelLinesVertexAttributeColorMap: (
+    modelId: string,
+    lineIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  modelLinesVertexAttributeNoDataColor: (modelId: string, lineId?: string) => unknown;
+  setModelLinesVertexAttributeNoDataColor: (
+    modelId: string,
+    lineIds: string[],
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelLinesVertexAttribute() {
+function useModelLinesVertexAttribute(): UseModelLinesVertexAttributeReturn {
   const dataStore = useDataStore();
   const modelLinesCommonStyle = useModelLinesCommonStyle();
   const viewerStore = useViewerStore();
   function modelLinesVertexAttribute(modelId: string, lineId?: string): AttributeState {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
     return modelLinesCommonStyle.modelLineColoring(modelId, lineId).vertex as AttributeState;
   }
   function modelLinesVertexAttributeStoredConfig(
@@ -64,14 +114,10 @@ function useModelLinesVertexAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelLinesVertexAttribute(modelId, lineId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -80,32 +126,40 @@ function useModelLinesVertexAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelLinesVertexStyle(
+  async function mutateModelLinesVertexStyle(
     modelId: string,
     lineIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (lineIds.length > 1) {
-      modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelLinesCommonStyle.mutateModelLinesColoring(modelId, lineIds, {
         vertex: values,
-      });
+      }),
+    ];
+    if (lineIds.length > 1) {
+      tasks.push(
+        modelLinesCommonStyle.mutateModelLinesTypeColoring(modelId, {
+          vertex: values,
+        }),
+      );
     }
-    return modelLinesCommonStyle.mutateModelLinesColoring(modelId, lineIds, {
-      vertex: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelLinesVertexAttributeStoredConfig(
+  async function setModelLinesVertexAttributeStoredConfig(
     modelId: string,
     lineIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelLinesVertexStyle(modelId, lineIds, {
+  ): Promise<void> {
+    if (name === undefined || item === undefined) {
+      return;
+    }
+    await mutateModelLinesVertexStyle(modelId, lineIds, {
       storedConfigs: {
-        [name as string]: {
+        [name]: {
           lastItem: item,
-          [item as number]: config,
+          [item]: config,
         },
       },
     });
@@ -119,8 +173,9 @@ function useModelLinesVertexAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelLinesVertexAttribute(modelId, lineId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -158,18 +213,18 @@ function useModelLinesVertexAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelLinesVertexStyle(modelId, lineIds, {
+  ): Promise<unknown> {
+    await mutateModelLinesVertexStyle(modelId, lineIds, {
       name,
       item,
     });
-    setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const line_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, lineIds);
     const params = {
       id: modelId,
@@ -186,7 +241,7 @@ function useModelLinesVertexAttribute() {
       params,
     });
   }
-  function applyVertexAttribute(modelId: string, lineIds: string[]) {
+  async function applyVertexAttribute(modelId: string, lineIds: string[]): Promise<void> {
     const name = modelLinesVertexAttributeName(modelId, lineIds[0]);
     const item = modelLinesVertexAttributeItem(modelId, lineIds[0]);
     const storedConfig = modelLinesVertexAttributeStoredConfig(modelId, lineIds[0], name, item);
@@ -199,46 +254,53 @@ function useModelLinesVertexAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelLinesVertexAttributeValid(attribute)) {
-      return setModelLinesVertexAttribute(modelId, lineIds, attribute);
+      await setModelLinesVertexAttribute(modelId, lineIds, attribute);
     }
-    return Promise.resolve();
   }
-  function setModelLinesVertexAttributeName(modelId: string, lineIds: string[], name: string) {
+  async function setModelLinesVertexAttributeName(
+    modelId: string,
+    lineIds: string[],
+    name: string,
+  ): Promise<unknown> {
     const item = modelLinesVertexAttributeLastItem(modelId, lineIds[0], name);
-    mutateModelLinesVertexStyle(modelId, lineIds, {
+    await mutateModelLinesVertexStyle(modelId, lineIds, {
       name,
       item,
     });
     return applyVertexAttribute(modelId, lineIds);
   }
-  function setModelLinesVertexAttributeItem(modelId: string, lineIds: string[], item: number) {
-    mutateModelLinesVertexStyle(modelId, lineIds, {
+  async function setModelLinesVertexAttributeItem(
+    modelId: string,
+    lineIds: string[],
+    item: number,
+  ): Promise<unknown> {
+    await mutateModelLinesVertexStyle(modelId, lineIds, {
       item,
     });
     return applyVertexAttribute(modelId, lineIds);
   }
-  function setModelLinesVertexAttributeRange(
+  async function setModelLinesVertexAttributeRange(
     modelId: string,
     lineIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesVertexAttributeName(modelId, lineIds[0]);
     const item = modelLinesVertexAttributeItem(modelId, lineIds[0]);
-    setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
       minimum,
       maximum,
     });
     return applyVertexAttribute(modelId, lineIds);
   }
-  function setModelLinesVertexAttributeColorMap(
+  async function setModelLinesVertexAttributeColorMap(
     modelId: string,
     lineIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesVertexAttributeName(modelId, lineIds[0]);
     const item = modelLinesVertexAttributeItem(modelId, lineIds[0]);
-    setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
+    await setModelLinesVertexAttributeStoredConfig(modelId, lineIds, name, item, {
       colorMap,
     });
     return applyVertexAttribute(modelId, lineIds);
@@ -253,7 +315,7 @@ function useModelLinesVertexAttribute() {
     modelId: string,
     lineIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = modelLinesVertexAttributeName(modelId, lineIds[0]);
     const item = modelLinesVertexAttributeItem(modelId, lineIds[0]);
     const storedConfig = modelLinesVertexAttributeStoredConfig(modelId, lineIds[0], name, item);
diff --git a/internal/stores/data_style/model/lines/visibility.ts b/internal/stores/data_style/model/lines/visibility.ts
index d9878f52..0a454bd7 100644
--- a/internal/stores/data_style/model/lines/visibility.ts
+++ b/internal/stores/data_style/model/lines/visibility.ts
@@ -4,7 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.lines.visibility;
 
-export function useModelLinesVisibility() {
+export function useModelLinesVisibility(): {
+  setModelLinesVisibility: (
+    modelId: string,
+    lines_ids: string[],
+    visibility: boolean | undefined,
+  ) => Promise<unknown>;
+  modelLineVisibility: (id: string, line_id?: string) => unknown;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelLinesCommonStyle = useModelLinesCommonStyle();
 
@@ -12,12 +19,18 @@ export function useModelLinesVisibility() {
     return modelLinesCommonStyle.modelLineStyle(id, line_id).visibility;
   }
 
-  function setModelLinesVisibility(
+  async function setModelLinesVisibility(
     modelId: string,
     lines_ids: string[],
     visibility: boolean | undefined,
-  ) {
-    return modelCommonStyle.setModelTypeVisibility(modelId, lines_ids, visibility, schema);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeVisibility(
+      modelId,
+      lines_ids,
+      visibility,
+      schema,
+    );
+    return result;
   }
 
   return { setModelLinesVisibility, modelLineVisibility };
diff --git a/internal/stores/data_style/model/points/common.ts b/internal/stores/data_style/model/points/common.ts
index d308bb34..2a235dd8 100644
--- a/internal/stores/data_style/model/points/common.ts
+++ b/internal/stores/data_style/model/points/common.ts
@@ -1,17 +1,21 @@
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
-export function useModelPointsCommonStyle() {
+export function useModelPointsCommonStyle(): {
+  modelPointsStyle: (id: string) => StyleValues;
+  mutateModelPointsStyle: (id: string, values: StyleValues) => Promise<unknown>;
+} {
   const dataStyleState = useDataStyleState();
 
-  function mutateModelPointsStyle(id: string, values: StyleValues) {
-    return dataStyleState.mutateStyle(id, {
+  async function mutateModelPointsStyle(id: string, values: StyleValues): Promise<unknown> {
+    const result = await dataStyleState.mutateStyle(id, {
       points: values,
     });
+    return result;
   }
 
   function modelPointsStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).points as StyleValues;
+    return dataStyleState.getStyle(id).points ?? {};
   }
 
   return {
diff --git a/internal/stores/data_style/model/points/index.ts b/internal/stores/data_style/model/points/index.ts
index 2fbbbc18..6f4569ee 100644
--- a/internal/stores/data_style/model/points/index.ts
+++ b/internal/stores/data_style/model/points/index.ts
@@ -3,20 +3,27 @@ import { useModelPointsCommonStyle } from "./common";
 import { useModelPointsSizeStyle } from "./size";
 import { useModelPointsVisibilityStyle } from "./visibility";
 
-export function useModelPointsStyle() {
+export function useModelPointsStyle(): {
+  applyModelPointsStyle: (id: string) => Promise<unknown[]>;
+} & ReturnType<typeof useModelPointsCommonStyle> &
+  ReturnType<typeof useModelPointsVisibilityStyle> &
+  ReturnType<typeof useModelPointsSizeStyle> {
   const modelPointsCommonStyle = useModelPointsCommonStyle();
   const modelPointsVisibilityStyle = useModelPointsVisibilityStyle();
   const modelPointsSizeStyle = useModelPointsSizeStyle();
 
-  function applyModelPointsStyle(id: string) {
+  async function applyModelPointsStyle(id: string): Promise<unknown[]> {
     const style = modelPointsCommonStyle.modelPointsStyle(id);
-    return Promise.all([
+    const result = await Promise.all([
       modelPointsVisibilityStyle.setModelPointsVisibility(
         id,
+        // oxlint-disable-next-line no-unsafe-type-assertion -- points style values are dynamically typed at runtime.
         style.visibility as boolean | undefined,
       ),
+      // oxlint-disable-next-line no-unsafe-type-assertion -- points style values are dynamically typed at runtime.
       modelPointsSizeStyle.setModelPointsSize(id, style.size as number | undefined),
     ]);
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/model/points/size.ts b/internal/stores/data_style/model/points/size.ts
index e6b7cf83..f7d1782e 100644
--- a/internal/stores/data_style/model/points/size.ts
+++ b/internal/stores/data_style/model/points/size.ts
@@ -8,25 +8,33 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.model.points.size;
 
-export function useModelPointsSizeStyle() {
+export function useModelPointsSizeStyle(): {
+  modelPointsSize: (id: string) => number | undefined;
+  setModelPointsSize: (id: string, size: number | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const modelPointsCommonStyle = useModelPointsCommonStyle();
 
   function modelPointsSize(id: string): number | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- points style values are dynamically typed at runtime.
     return modelPointsCommonStyle.modelPointsStyle(id).size as number | undefined;
   }
 
-  function setModelPointsSize(id: string, size: number | undefined) {
+  async function setModelPointsSize(id: string, size: number | undefined): Promise<unknown> {
     const params = { id, size };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
-        response_function: () => modelPointsCommonStyle.mutateModelPointsStyle(id, { size }),
+        response_function: async () => {
+          const mutateResult = await modelPointsCommonStyle.mutateModelPointsStyle(id, { size });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/model/points/visibility.ts b/internal/stores/data_style/model/points/visibility.ts
index 69d8e8f9..a3c2dd4d 100644
--- a/internal/stores/data_style/model/points/visibility.ts
+++ b/internal/stores/data_style/model/points/visibility.ts
@@ -8,25 +8,35 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.model.points.visibility;
 
-export function useModelPointsVisibilityStyle() {
+export function useModelPointsVisibilityStyle(): {
+  modelPointsVisibility: (id: string) => boolean | undefined;
+  setModelPointsVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+} {
   const viewerStore = useViewerStore();
   const modelPointsCommonStyle = useModelPointsCommonStyle();
 
   function modelPointsVisibility(id: string): boolean | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- points style values are dynamically typed at runtime.
     return modelPointsCommonStyle.modelPointsStyle(id).visibility as boolean | undefined;
   }
 
-  function setModelPointsVisibility(id: string, visibility: boolean | undefined) {
+  async function setModelPointsVisibility(
+    id: string,
+    visibility: boolean | undefined,
+  ): Promise<unknown> {
     const params = { id, visibility };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       { schema, params },
       {
-        response_function: () =>
-          modelPointsCommonStyle.mutateModelPointsStyle(id, {
+        response_function: async () => {
+          const mutateResult = await modelPointsCommonStyle.mutateModelPointsStyle(id, {
             visibility,
-          }),
+          });
+          return mutateResult;
+        },
       },
     );
+    return result;
   }
 
   return {
diff --git a/internal/stores/data_style/model/selection.ts b/internal/stores/data_style/model/selection.ts
index b788a857..477d9463 100644
--- a/internal/stores/data_style/model/selection.ts
+++ b/internal/stores/data_style/model/selection.ts
@@ -1,14 +1,7 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type {
-  ModelComponentStyle,
-  ModelComponentTypeStyle,
-  StyleValues,
-} from "@ogw_internal/stores/data_style/types.js";
 import { MESH_COMPONENT_TYPES } from "@ogw_front/utils/default_styles";
-import { database } from "@ogw_internal/database/database";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import type { Table } from "dexie";
-import type { ComputedRef, Ref } from "vue";
+import { database } from "@ogw_internal/database/database";
 import type { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 
 interface ModelComponentRecord {
@@ -19,80 +12,115 @@ interface ModelComponentRecord {
 
 type DataStyleState = ReturnType<typeof useDataStyleState>;
 
+// oxlint-disable-next-line no-unsafe-type-assertion -- trusted Dexie table boundary; see other database table casts in this codebase.
 const model_components_db = database.model_components as unknown as Table<
   ModelComponentRecord,
   string
 >;
 
-function buildSelection(
-  modelId: string,
-  components: ModelComponentRecord[],
-  componentStyles: Ref<Record<string, ModelComponentStyle>>,
-  modelComponentTypeStyles: Ref<Record<string, ModelComponentTypeStyle>>,
-  dataStyleState: DataStyleState,
-): string[] {
+function groupComponentsByType(
+  components: readonly ModelComponentRecord[],
+): Record<string, ModelComponentRecord[]> {
   const componentsByType: Record<string, ModelComponentRecord[]> = Object.fromEntries(
     MESH_COMPONENT_TYPES.map((componentType) => [componentType, []]),
   );
   for (const component of components) {
-    if (componentsByType[component.type]) {
-      componentsByType[component.type]!.push(component);
+    const list = componentsByType[component.type];
+    if (list !== undefined) {
+      list.push(component);
     }
   }
+  return componentsByType;
+}
 
+interface TypeSelectionContext {
+  readonly modelId: string;
+  readonly groupStyles: ReturnType<DataStyleState["getStyle"]>;
+  readonly dataStyleState: DataStyleState;
+}
+
+function computeTypeSelection(
+  componentType: string,
+  typeComponents: readonly ModelComponentRecord[],
+  context: TypeSelectionContext,
+): string[] {
+  const { modelId, groupStyles, dataStyleState } = context;
+  const typeKey = `${componentType.toLowerCase()}s`;
+  const typeStyleKey = `${modelId}_${componentType}`;
+  const typeStyle = dataStyleState.modelComponentTypeStyles.value[typeStyleKey];
+  // oxlint-disable-next-line no-unsafe-type-assertion -- dynamically-keyed lookup into StyleValues; see other database/style casts in this codebase.
+  const groupTypeStyle = (groupStyles as unknown as Record<string, StyleValues | undefined>)[
+    typeKey
+  ];
+  const defaultVisibility =
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility field is defined by the data style schema.
+    (typeStyle?.visibility as boolean | undefined) ??
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility field is defined by the data style schema.
+    (groupTypeStyle?.visibility as boolean | undefined) ??
+    true;
+
+  const selection: string[] = [];
+  let allVisible = true;
+  for (const component of typeComponents) {
+    const styleKey = `${modelId}_${component.geode_id}`;
+    const componentStyle = dataStyleState.componentStyles.value[styleKey];
+    // oxlint-disable-next-line no-unsafe-type-assertion -- visibility field is defined by the data style schema.
+    const isVisible = (componentStyle?.visibility as boolean | undefined) ?? defaultVisibility;
+    if (isVisible) {
+      selection.push(component.geode_id);
+    } else {
+      allVisible = false;
+    }
+  }
+  if (allVisible) {
+    selection.push(componentType);
+  }
+  return selection;
+}
+
+function buildSelection(
+  modelId: string,
+  components: readonly ModelComponentRecord[],
+  dataStyleState: DataStyleState,
+): string[] {
+  const componentsByType = groupComponentsByType(components);
   const groupStyles = dataStyleState.getStyle(modelId);
+  const context: TypeSelectionContext = { modelId, groupStyles, dataStyleState };
+
   const selection: string[] = [];
   for (const componentType of MESH_COMPONENT_TYPES) {
-    const typeComponents = componentsByType[componentType];
-    if (!typeComponents || typeComponents.length === 0) {
+    const typeComponents = componentsByType[componentType] ?? [];
+    if (typeComponents.length === 0) {
       continue;
     }
-
-    const typeKey = `${componentType.toLowerCase()}s`;
-    const typeStyleKey = `${modelId}_${componentType}`;
-    const typeStyle = modelComponentTypeStyles.value[typeStyleKey];
-    const defaultVisibility =
-      (typeStyle?.visibility as boolean | undefined) ??
-      ((groupStyles[typeKey] as StyleValues | undefined)?.visibility as boolean | undefined) ??
-      true;
-
-    let allVisible = true;
-    for (const component of typeComponents) {
-      const styleKey = `${modelId}_${component.geode_id}`;
-      const isVisible =
-        (componentStyles.value[styleKey]?.visibility as boolean | undefined) ?? defaultVisibility;
-      if (isVisible) {
-        selection.push(component.geode_id);
-      } else {
-        allVisible = false;
-      }
-    }
-    if (allVisible) {
-      selection.push(componentType);
-    }
+    selection.push(...computeTypeSelection(componentType, typeComponents, context));
   }
   return selection;
 }
 
 const selectionCache = new Map<string, ComputedRef<string[]>>();
 
-function useModelSelection(modelId: string | undefined, dataStyleState: DataStyleState) {
-  if (!modelId) {
+function useModelSelection(
+  modelId: string | undefined,
+  dataStyleState: DataStyleState,
+): ComputedRef<string[]> {
+  if (modelId === undefined || modelId === "") {
     return computed<string[]>(() => []);
   }
 
-  const cacheKey = `${modelId}`;
-  if (selectionCache.has(cacheKey)) {
-    return selectionCache.get(cacheKey)!;
+  const cacheKey = modelId;
+  const cachedSelection = selectionCache.get(cacheKey);
+  if (cachedSelection !== undefined) {
+    return cachedSelection;
   }
 
   const allComponents = ref<ModelComponentRecord[]>([]);
 
-  (async () => {
+  void (async (): Promise<void> => {
     try {
       allComponents.value = await model_components_db.where("id").equals(modelId).toArray();
-    } catch (error) {
-      console.error("Error fetching model components:", error);
+    } catch {
+      allComponents.value = [];
     }
   })();
 
@@ -100,13 +128,7 @@ function useModelSelection(modelId: string | undefined, dataStyleState: DataStyl
     if (allComponents.value.length === 0) {
       return [];
     }
-    return buildSelection(
-      modelId,
-      allComponents.value,
-      dataStyleState.componentStyles,
-      dataStyleState.modelComponentTypeStyles,
-      dataStyleState,
-    );
+    return buildSelection(modelId, allComponents.value, dataStyleState);
   });
 
   selectionCache.set(cacheKey, computedSelection);
diff --git a/internal/stores/data_style/model/surfaces/color.ts b/internal/stores/data_style/model/surfaces/color.ts
index 5035f5f7..dca47d2e 100644
--- a/internal/stores/data_style/model/surfaces/color.ts
+++ b/internal/stores/data_style/model/surfaces/color.ts
@@ -1,21 +1,35 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { isModelSurfacesPolygonAttributeValid, useModelSurfacesPolygonAttribute } from "./polygon";
 import { isModelSurfacesVertexAttributeValid, useModelSurfacesVertexAttribute } from "./vertex";
+import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelSurfacesCommonStyle } from "./common";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.surfaces.color;
 
-export function useModelSurfacesColor() {
+export function useModelSurfacesColor(): {
+  setModelSurfacesColor: (
+    modelId: string,
+    surfaces_ids: string[],
+    color: unknown,
+    activeColoring?: string,
+  ) => Promise<unknown>;
+  modelSurfaceColoring: (id: string, surface_id?: string) => StyleValues;
+  modelSurfaceColor: (id: string, surface_id?: string) => unknown;
+  modelSurfaceActiveColoring: (id: string, surface_id?: string) => unknown;
+  setModelSurfacesActiveColoring: (
+    modelId: string,
+    surfaces_ids: string[],
+    activeColoring: string,
+  ) => Promise<unknown>;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelSurfacesCommonStyle = useModelSurfacesCommonStyle();
   const modelSurfacesVertexAttribute = useModelSurfacesVertexAttribute();
   const modelSurfacesPolygonAttribute = useModelSurfacesPolygonAttribute();
 
   function modelSurfaceColoring(id: string, surface_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelSurfacesCommonStyle.modelSurfaceStyle(id, surface_id).coloring as StyleValues;
   }
 
@@ -23,13 +37,20 @@ export function useModelSurfacesColor() {
     return modelSurfaceColoring(id, surface_id).constant;
   }
 
-  function setModelSurfacesColor(
+  async function setModelSurfacesColor(
     modelId: string,
     surfaces_ids: string[],
     color: unknown,
     activeColoring = "constant",
-  ) {
-    return modelCommonStyle.setModelTypeColor(modelId, surfaces_ids, color, schema, activeColoring);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeColor(
+      modelId,
+      surfaces_ids,
+      color,
+      schema,
+      activeColoring,
+    );
+    return result;
   }
 
   function modelSurfaceActiveColoring(id: string, surface_id?: string): unknown {
@@ -40,9 +61,9 @@ export function useModelSurfacesColor() {
     modelId: string,
     surfaces_ids: string[],
     activeColoring: string,
-  ) {
+  ): Promise<unknown> {
     if (surfaces_ids.length > 1) {
-      modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, {
+      await modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, {
         active: activeColoring,
       });
     }
@@ -105,6 +126,7 @@ export function useModelSurfacesColor() {
         );
       }
     }
+    return undefined;
   }
 
   return {
diff --git a/internal/stores/data_style/model/surfaces/common.ts b/internal/stores/data_style/model/surfaces/common.ts
index dc811132..392a54ed 100644
--- a/internal/stores/data_style/model/surfaces/common.ts
+++ b/internal/stores/data_style/model/surfaces/common.ts
@@ -3,12 +3,24 @@ import merge from "lodash/merge";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 
-export function useModelSurfacesCommonStyle() {
+interface UseModelSurfacesCommonStyleReturn {
+  modelSurfacesStyle: (id: string) => StyleValues;
+  modelSurfaceStyle: (id: string, surface_id?: string) => StyleValues;
+  modelSurfaceColoring: (id: string, surface_id?: string) => StyleValues;
+  mutateModelSurfacesColoring: (
+    id: string,
+    surfaces_ids: readonly string[],
+    values: StyleValues,
+  ) => Promise<void>;
+  mutateModelSurfacesTypeColoring: (id: string, values: StyleValues) => Promise<void>;
+}
+
+export function useModelSurfacesCommonStyle(): UseModelSurfacesCommonStyleReturn {
   const dataStyleState = useDataStyleState();
   const modelCommonStyle = useModelCommonStyle();
 
   function modelSurfacesStyle(id: string): StyleValues {
-    return dataStyleState.getStyle(id).surfaces as StyleValues;
+    return dataStyleState.getStyle(id).surfaces ?? {};
   }
 
   function modelComponentTypeSurfacesStyle(id: string): StyleValues {
@@ -27,17 +39,22 @@ export function useModelSurfacesCommonStyle() {
   }
 
   function modelSurfaceColoring(id: string, surface_id?: string): StyleValues {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring shape is defined by the data style schema.
     return modelSurfaceStyle(id, surface_id).coloring as StyleValues;
   }
 
-  function mutateModelSurfacesColoring(id: string, surfaces_ids: string[], values: StyleValues) {
-    return modelCommonStyle.mutateComponentStyles(id, surfaces_ids, {
+  async function mutateModelSurfacesColoring(
+    id: string,
+    surfaces_ids: readonly string[],
+    values: StyleValues,
+  ): Promise<void> {
+    await modelCommonStyle.mutateComponentStyles(id, [...surfaces_ids], {
       coloring: values,
     });
   }
 
-  function mutateModelSurfacesTypeColoring(id: string, values: StyleValues) {
-    return modelCommonStyle.mutateModelComponentTypeStyle(id, "Surface", {
+  async function mutateModelSurfacesTypeColoring(id: string, values: StyleValues): Promise<void> {
+    await modelCommonStyle.mutateModelComponentTypeStyle(id, "Surface", {
       coloring: values,
     });
   }
diff --git a/internal/stores/data_style/model/surfaces/index.ts b/internal/stores/data_style/model/surfaces/index.ts
index fc0bab12..293230f5 100644
--- a/internal/stores/data_style/model/surfaces/index.ts
+++ b/internal/stores/data_style/model/surfaces/index.ts
@@ -19,11 +19,21 @@ interface AttributeGroup {
   surfaces_ids: string[];
 }
 
-async function setModelSurfacesDefaultStyle(_id: string) {
+async function setModelSurfacesDefaultStyle(_id: string): Promise<void> {
   // Placeholder
 }
+
+type UseModelSurfacesStyleReturn = ReturnType<typeof useModelSurfacesCommonStyle> &
+  ReturnType<typeof useModelSurfacesVisibility> &
+  ReturnType<typeof useModelSurfacesColor> &
+  ReturnType<typeof useModelSurfacesVertexAttribute> &
+  ReturnType<typeof useModelSurfacesPolygonAttribute> & {
+    applyModelSurfacesStyle: (modelId: string) => Promise<void>;
+    setModelSurfacesDefaultStyle: (id: string) => Promise<void>;
+  };
+
 // oxlint-disable-next-line max-lines-per-function
-export function useModelSurfacesStyle() {
+export function useModelSurfacesStyle(): UseModelSurfacesStyleReturn {
   const dataStore = useDataStore();
   const modelCommonStyle = useModelSurfacesCommonStyle();
   const modelVisibilityStyle = useModelSurfacesVisibility();
@@ -31,32 +41,39 @@ export function useModelSurfacesStyle() {
   const modelSurfacesVertexAttribute = useModelSurfacesVertexAttribute();
   const modelSurfacesPolygonAttribute = useModelSurfacesPolygonAttribute();
 
-  function applyModelSurfacesVisibilityStyle(modelId: string, surfaces_ids: string[]) {
+  async function applyModelSurfacesVisibilityStyle(
+    modelId: string,
+    surfaces_ids: string[],
+  ): Promise<void> {
     const visibilityGroups: Record<string, string[]> = {};
     for (const surfaces_id of surfaces_ids) {
       const style = modelCommonStyle.modelSurfaceStyle(modelId, surfaces_id);
       const visibility = String(style.visibility);
-      if (!visibilityGroups[visibility]) {
-        visibilityGroups[visibility] = [];
-      }
+      visibilityGroups[visibility] ??= [];
       visibilityGroups[visibility].push(surfaces_id);
     }
-    return Promise.all(
-      Object.entries(visibilityGroups).map(([visibility, ids]) =>
-        modelVisibilityStyle.setModelSurfacesVisibility(modelId, ids, visibility === "true"),
-      ),
+    await Promise.all(
+      Object.entries(visibilityGroups).map(async ([visibility, ids]) => {
+        const result = await modelVisibilityStyle.setModelSurfacesVisibility(
+          modelId,
+          ids,
+          visibility === "true",
+        );
+        return result;
+      }),
     );
   }
 
-  function applyModelSurfacesColoringStyle(modelId: string, surfaces_ids: string[]) {
+  async function applyModelSurfacesColoringStyle(
+    modelId: string,
+    surfaces_ids: string[],
+  ): Promise<unknown[]> {
     const activeColoringGroups: Record<string, string[]> = {};
     for (const surfaces_id of surfaces_ids) {
       const activeColoring = String(
         modelColorStyle.modelSurfaceActiveColoring(modelId, surfaces_id),
       );
-      if (!activeColoringGroups[activeColoring]) {
-        activeColoringGroups[activeColoring] = [];
-      }
+      activeColoringGroups[activeColoring] ??= [];
       activeColoringGroups[activeColoring].push(surfaces_id);
     }
 
@@ -68,15 +85,19 @@ export function useModelSurfacesStyle() {
         for (const surfaces_id of type_surfaces_ids) {
           const color = modelColorStyle.modelSurfaceColor(modelId, surfaces_id);
           const color_key = JSON.stringify(color);
-          if (!colorGroups[color_key]) {
-            colorGroups[color_key] = { color, surfaces_ids: [] };
-          }
+          colorGroups[color_key] ??= { color, surfaces_ids: [] };
           colorGroups[color_key].surfaces_ids.push(surfaces_id);
         }
         coloringPromises.push(
-          ...Object.values(colorGroups).map(({ color, surfaces_ids: ids }) =>
-            modelColorStyle.setModelSurfacesColor(modelId, ids, color, "constant"),
-          ),
+          ...Object.values(colorGroups).map(async ({ color, surfaces_ids: ids }) => {
+            const result = await modelColorStyle.setModelSurfacesColor(
+              modelId,
+              ids,
+              color,
+              "constant",
+            );
+            return result;
+          }),
         );
       } else if (type === "random") {
         coloringPromises.push(
@@ -106,28 +127,32 @@ export function useModelSurfacesStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!vertexGroups[key]) {
-            vertexGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              surfaces_ids: [],
-            };
-          }
+          vertexGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            surfaces_ids: [],
+          };
           vertexGroups[key].surfaces_ids.push(surfaces_id);
         }
         coloringPromises.push(
           ...Object.values(vertexGroups).map(
-            ({ name, item, minimum, maximum, colorMap, surfaces_ids: ids }) =>
-              modelSurfacesVertexAttribute.setModelSurfacesVertexAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, surfaces_ids: ids }) => {
+              const result = await modelSurfacesVertexAttribute.setModelSurfacesVertexAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       } else if (type === "polygon") {
@@ -152,41 +177,46 @@ export function useModelSurfacesStyle() {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          if (!polygonGroups[key]) {
-            polygonGroups[key] = {
-              name,
-              item,
-              minimum,
-              maximum,
-              colorMap,
-              surfaces_ids: [],
-            };
-          }
+          polygonGroups[key] ??= {
+            name,
+            item,
+            minimum,
+            maximum,
+            colorMap,
+            surfaces_ids: [],
+          };
           polygonGroups[key].surfaces_ids.push(surfaces_id);
         }
         coloringPromises.push(
           ...Object.values(polygonGroups).map(
-            ({ name, item, minimum, maximum, colorMap, surfaces_ids: ids }) =>
-              modelSurfacesPolygonAttribute.setModelSurfacesPolygonAttribute(modelId, ids, {
-                name,
-                item,
-                minimum,
-                maximum,
-                colorMap,
-              }),
+            async ({ name, item, minimum, maximum, colorMap, surfaces_ids: ids }) => {
+              const result = await modelSurfacesPolygonAttribute.setModelSurfacesPolygonAttribute(
+                modelId,
+                ids,
+                {
+                  name,
+                  item,
+                  minimum,
+                  maximum,
+                  colorMap,
+                },
+              );
+              return result;
+            },
           ),
         );
       }
     }
-    return Promise.all(coloringPromises);
+    const results = await Promise.all(coloringPromises);
+    return results;
   }
 
-  async function applyModelSurfacesStyle(modelId: string) {
+  async function applyModelSurfacesStyle(modelId: string): Promise<void> {
     const surfaces_ids = await dataStore.getSurfacesGeodeIds(modelId);
     if (surfaces_ids.length === 0) {
       return;
     }
-    return Promise.all([
+    await Promise.all([
       applyModelSurfacesVisibilityStyle(modelId, surfaces_ids),
       applyModelSurfacesColoringStyle(modelId, surfaces_ids),
     ]);
diff --git a/internal/stores/data_style/model/surfaces/polygon.ts b/internal/stores/data_style/model/surfaces/polygon.ts
index 4149122a..8099a927 100644
--- a/internal/stores/data_style/model/surfaces/polygon.ts
+++ b/internal/stores/data_style/model/surfaces/polygon.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -50,14 +51,68 @@ function isModelSurfacesPolygonAttributeValid({
   );
 }
 
+interface UseModelSurfacesPolygonAttributeReturn {
+  modelSurfacesPolygonAttributeName: (modelId: string, surfaceId?: string) => string | undefined;
+  modelSurfacesPolygonAttributeItem: (modelId: string, surfaceId?: string) => number;
+  modelSurfacesPolygonAttributeRange: (
+    modelId: string,
+    surfaceId?: string,
+  ) => [number | undefined, number | undefined];
+  modelSurfacesPolygonAttributeColorMap: (
+    modelId: string,
+    surfaceId?: string,
+  ) => string | undefined;
+  modelSurfacesPolygonAttributeStoredConfig: (
+    modelId: string,
+    surfaceId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelSurfacesPolygonAttribute: (
+    modelId: string,
+    surfaceIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelSurfacesPolygonAttributeName: (
+    modelId: string,
+    surfaceIds: string[],
+    name: string,
+  ) => Promise<void>;
+  setModelSurfacesPolygonAttributeItem: (
+    modelId: string,
+    surfaceIds: string[],
+    item: number,
+  ) => Promise<void>;
+  setModelSurfacesPolygonAttributeRange: (
+    modelId: string,
+    surfaceIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<void>;
+  setModelSurfacesPolygonAttributeColorMap: (
+    modelId: string,
+    surfaceIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<void>;
+  modelSurfacesPolygonAttributeNoDataColor: (modelId: string, surfaceId?: string) => unknown;
+  setModelSurfacesPolygonAttributeNoDataColor: (
+    modelId: string,
+    surfaceIds: string[],
+    no_data_color: unknown,
+  ) => Promise<void>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelSurfacesPolygonAttribute() {
+function useModelSurfacesPolygonAttribute(): UseModelSurfacesPolygonAttributeReturn {
   const dataStore = useDataStore();
   const modelSurfacesCommonStyle = useModelSurfacesCommonStyle();
   const viewerStore = useViewerStore();
   function modelSurfacesPolygonAttribute(modelId: string, surfaceId?: string): AttributeState {
-    return modelSurfacesCommonStyle.modelSurfaceColoring(modelId, surfaceId)
-      .polygon as AttributeState;
+    return (
+      modelSurfacesCommonStyle.modelSurfaceColoring(modelId, surfaceId)
+        // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.polygon shape is defined by the data style schema.
+        .polygon as AttributeState
+    );
   }
   function modelSurfacesPolygonAttributeStoredConfig(
     modelId: string,
@@ -66,14 +121,10 @@ function useModelSurfacesPolygonAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelSurfacesPolygonAttribute(modelId, surfaceId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,34 +133,32 @@ function useModelSurfacesPolygonAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelSurfacesPolygonStyle(
+  async function mutateModelSurfacesPolygonStyle(
     modelId: string,
     surfaceIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (surfaceIds.length > 1) {
-      modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelSurfacesCommonStyle.mutateModelSurfacesColoring(modelId, surfaceIds, {
         polygon: values,
-      });
+      }),
+    ];
+    if (surfaceIds.length > 1) {
+      tasks.push(
+        modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, { polygon: values }),
+      );
     }
-    return modelSurfacesCommonStyle.mutateModelSurfacesColoring(modelId, surfaceIds, {
-      polygon: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelSurfacesPolygonAttributeStoredConfig(
+  async function setModelSurfacesPolygonAttributeStoredConfig(
     modelId: string,
     surfaceIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelSurfacesPolygonStyle(modelId, surfaceIds, {
-      storedConfigs: {
-        [name as string]: {
-          lastItem: item,
-          [item as number]: config,
-        },
-      },
+  ): Promise<void> {
+    await mutateModelSurfacesPolygonStyle(modelId, surfaceIds, {
+      storedConfigs: { [name ?? ""]: { lastItem: item, [item ?? 0]: config } },
     });
   }
   function modelSurfacesPolygonAttributeName(
@@ -124,8 +173,9 @@ function useModelSurfacesPolygonAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelSurfacesPolygonAttribute(modelId, surfaceId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -166,18 +216,15 @@ function useModelSurfacesPolygonAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelSurfacesPolygonStyle(modelId, surfaceIds, {
-      name,
-      item,
-    });
-    setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
+  ): Promise<unknown> {
+    await mutateModelSurfacesPolygonStyle(modelId, surfaceIds, { name, item });
+    await setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, surfaceIds);
     const params = {
       id: modelId,
@@ -189,12 +236,10 @@ function useModelSurfacesPolygonAttribute() {
       maximum,
       no_data_color,
     };
-    return viewerStore.request({
-      schema: attributeSchema,
-      params,
-    });
+    const result = await viewerStore.request({ schema: attributeSchema, params });
+    return result;
   }
-  function applyPolygonAttribute(modelId: string, surfaceIds: string[]) {
+  async function applyPolygonAttribute(modelId: string, surfaceIds: string[]): Promise<void> {
     const name = modelSurfacesPolygonAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesPolygonAttributeItem(modelId, surfaceIds[0]);
     const storedConfig = modelSurfacesPolygonAttributeStoredConfig(
@@ -212,57 +257,51 @@ function useModelSurfacesPolygonAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelSurfacesPolygonAttributeValid(attribute)) {
-      return setModelSurfacesPolygonAttribute(modelId, surfaceIds, attribute);
+      await setModelSurfacesPolygonAttribute(modelId, surfaceIds, attribute);
     }
-    return Promise.resolve();
   }
-  function setModelSurfacesPolygonAttributeName(
+  async function setModelSurfacesPolygonAttributeName(
     modelId: string,
     surfaceIds: string[],
     name: string,
-  ) {
+  ): Promise<void> {
     const item = modelSurfacesPolygonAttributeLastItem(modelId, surfaceIds[0], name);
-    mutateModelSurfacesPolygonStyle(modelId, surfaceIds, {
-      name,
-      item,
-    });
-    return applyPolygonAttribute(modelId, surfaceIds);
+    await mutateModelSurfacesPolygonStyle(modelId, surfaceIds, { name, item });
+    await applyPolygonAttribute(modelId, surfaceIds);
   }
-  function setModelSurfacesPolygonAttributeItem(
+  async function setModelSurfacesPolygonAttributeItem(
     modelId: string,
     surfaceIds: string[],
     item: number,
-  ) {
-    mutateModelSurfacesPolygonStyle(modelId, surfaceIds, {
-      item,
-    });
-    return applyPolygonAttribute(modelId, surfaceIds);
+  ): Promise<void> {
+    await mutateModelSurfacesPolygonStyle(modelId, surfaceIds, { item });
+    await applyPolygonAttribute(modelId, surfaceIds);
   }
-  function setModelSurfacesPolygonAttributeRange(
+  async function setModelSurfacesPolygonAttributeRange(
     modelId: string,
     surfaceIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<void> {
     const name = modelSurfacesPolygonAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesPolygonAttributeItem(modelId, surfaceIds[0]);
-    setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
+    await setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
       minimum,
       maximum,
     });
-    return applyPolygonAttribute(modelId, surfaceIds);
+    await applyPolygonAttribute(modelId, surfaceIds);
   }
-  function setModelSurfacesPolygonAttributeColorMap(
+  async function setModelSurfacesPolygonAttributeColorMap(
     modelId: string,
     surfaceIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<void> {
     const name = modelSurfacesPolygonAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesPolygonAttributeItem(modelId, surfaceIds[0]);
-    setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
+    await setModelSurfacesPolygonAttributeStoredConfig(modelId, surfaceIds, name, item, {
       colorMap,
     });
-    return applyPolygonAttribute(modelId, surfaceIds);
+    await applyPolygonAttribute(modelId, surfaceIds);
   }
   function modelSurfacesPolygonAttributeNoDataColor(modelId: string, surfaceId?: string): unknown {
     const name = modelSurfacesPolygonAttributeName(modelId, surfaceId);
@@ -274,7 +313,7 @@ function useModelSurfacesPolygonAttribute() {
     modelId: string,
     surfaceIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<void> {
     const name = modelSurfacesPolygonAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesPolygonAttributeItem(modelId, surfaceIds[0]);
     const storedConfig = modelSurfacesPolygonAttributeStoredConfig(
@@ -287,7 +326,7 @@ function useModelSurfacesPolygonAttribute() {
       ...storedConfig,
       no_data_color,
     });
-    return applyPolygonAttribute(modelId, surfaceIds);
+    await applyPolygonAttribute(modelId, surfaceIds);
   }
   return {
     modelSurfacesPolygonAttributeName,
diff --git a/internal/stores/data_style/model/surfaces/vertex.ts b/internal/stores/data_style/model/surfaces/vertex.ts
index 8f34f996..045f9bd1 100644
--- a/internal/stores/data_style/model/surfaces/vertex.ts
+++ b/internal/stores/data_style/model/surfaces/vertex.ts
@@ -1,3 +1,4 @@
+// oxlint-disable eslint/max-lines
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
@@ -50,14 +51,65 @@ function isModelSurfacesVertexAttributeValid({
   );
 }
 
+interface UseModelSurfacesVertexAttributeReturn {
+  modelSurfacesVertexAttributeName: (modelId: string, surfaceId?: string) => string | undefined;
+  modelSurfacesVertexAttributeItem: (modelId: string, surfaceId?: string) => number;
+  modelSurfacesVertexAttributeRange: (
+    modelId: string,
+    surfaceId?: string,
+  ) => [number | undefined, number | undefined];
+  modelSurfacesVertexAttributeColorMap: (modelId: string, surfaceId?: string) => string | undefined;
+  modelSurfacesVertexAttributeStoredConfig: (
+    modelId: string,
+    surfaceId: string | undefined,
+    name: string | undefined,
+    item: number | undefined,
+  ) => AttributeStoredConfig;
+  setModelSurfacesVertexAttribute: (
+    modelId: string,
+    surfaceIds: string[],
+    input: AttributeInput,
+  ) => Promise<unknown>;
+  setModelSurfacesVertexAttributeName: (
+    modelId: string,
+    surfaceIds: string[],
+    name: string,
+  ) => Promise<unknown>;
+  setModelSurfacesVertexAttributeItem: (
+    modelId: string,
+    surfaceIds: string[],
+    item: number,
+  ) => Promise<unknown>;
+  setModelSurfacesVertexAttributeRange: (
+    modelId: string,
+    surfaceIds: string[],
+    minimum: number,
+    maximum: number,
+  ) => Promise<unknown>;
+  setModelSurfacesVertexAttributeColorMap: (
+    modelId: string,
+    surfaceIds: string[],
+    colorMap: string | undefined,
+  ) => Promise<unknown>;
+  modelSurfacesVertexAttributeNoDataColor: (modelId: string, surfaceId?: string) => unknown;
+  setModelSurfacesVertexAttributeNoDataColor: (
+    modelId: string,
+    surfaceIds: string[],
+    no_data_color: unknown,
+  ) => Promise<unknown>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelSurfacesVertexAttribute() {
+function useModelSurfacesVertexAttribute(): UseModelSurfacesVertexAttributeReturn {
   const dataStore = useDataStore();
   const modelSurfacesCommonStyle = useModelSurfacesCommonStyle();
   const viewerStore = useViewerStore();
   function modelSurfacesVertexAttribute(modelId: string, surfaceId?: string): AttributeState {
-    return modelSurfacesCommonStyle.modelSurfaceColoring(modelId, surfaceId)
-      .vertex as AttributeState;
+    return (
+      modelSurfacesCommonStyle.modelSurfaceColoring(modelId, surfaceId)
+        // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.vertex shape is defined by the data style schema.
+        .vertex as AttributeState
+    );
   }
   function modelSurfacesVertexAttributeStoredConfig(
     modelId: string,
@@ -66,14 +118,10 @@ function useModelSurfacesVertexAttribute() {
     item: number | undefined,
   ): AttributeStoredConfig {
     const { storedConfigs } = modelSurfacesVertexAttribute(modelId, surfaceId);
-    if (
-      storedConfigs &&
-      name !== undefined &&
-      name in storedConfigs &&
-      item !== undefined &&
-      item in storedConfigs[name]!
-    ) {
-      return storedConfigs[name]![item]!;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    const itemConfig = item === undefined ? undefined : nameConfig?.[item];
+    if (itemConfig !== undefined) {
+      return itemConfig;
     }
     return {
       minimum: undefined,
@@ -82,34 +130,32 @@ function useModelSurfacesVertexAttribute() {
       no_data_color: DEFAULT_NO_DATA_COLOR,
     };
   }
-  function mutateModelSurfacesVertexStyle(
+  async function mutateModelSurfacesVertexStyle(
     modelId: string,
     surfaceIds: string[],
     values: Record<string, unknown>,
-  ) {
-    if (surfaceIds.length > 1) {
-      modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, {
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [
+      modelSurfacesCommonStyle.mutateModelSurfacesColoring(modelId, surfaceIds, {
         vertex: values,
-      });
+      }),
+    ];
+    if (surfaceIds.length > 1) {
+      tasks.push(
+        modelSurfacesCommonStyle.mutateModelSurfacesTypeColoring(modelId, { vertex: values }),
+      );
     }
-    return modelSurfacesCommonStyle.mutateModelSurfacesColoring(modelId, surfaceIds, {
-      vertex: values,
-    });
+    await Promise.all(tasks);
   }
-  function setModelSurfacesVertexAttributeStoredConfig(
+  async function setModelSurfacesVertexAttributeStoredConfig(
     modelId: string,
     surfaceIds: string[],
     name: string | undefined,
     item: number | undefined,
     config: Partial<AttributeStoredConfig>,
-  ) {
-    return mutateModelSurfacesVertexStyle(modelId, surfaceIds, {
-      storedConfigs: {
-        [name as string]: {
-          lastItem: item,
-          [item as number]: config,
-        },
-      },
+  ): Promise<void> {
+    await mutateModelSurfacesVertexStyle(modelId, surfaceIds, {
+      storedConfigs: { [name ?? ""]: { lastItem: item, [item ?? 0]: config } },
     });
   }
   function modelSurfacesVertexAttributeName(
@@ -124,8 +170,9 @@ function useModelSurfacesVertexAttribute() {
     name: string | undefined,
   ): number {
     const { storedConfigs } = modelSurfacesVertexAttribute(modelId, surfaceId);
-    if (storedConfigs && name !== undefined && name in storedConfigs) {
-      return storedConfigs[name]!.lastItem;
+    const nameConfig = name === undefined ? undefined : storedConfigs?.[name];
+    if (nameConfig !== undefined) {
+      return nameConfig.lastItem;
     }
     return 0;
   }
@@ -166,18 +213,15 @@ function useModelSurfacesVertexAttribute() {
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
     }: AttributeInput,
-  ) {
-    mutateModelSurfacesVertexStyle(modelId, surfaceIds, {
-      name,
-      item,
-    });
-    setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
+  ): Promise<unknown> {
+    await mutateModelSurfacesVertexStyle(modelId, surfaceIds, { name, item });
+    await setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
       minimum,
       maximum,
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap as string);
+    const points = getRGBPointsFromPreset(colorMap ?? "");
     const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, surfaceIds);
     const params = {
       id: modelId,
@@ -189,12 +233,10 @@ function useModelSurfacesVertexAttribute() {
       maximum,
       no_data_color,
     };
-    return viewerStore.request({
-      schema: attributeSchema,
-      params,
-    });
+    const result = await viewerStore.request({ schema: attributeSchema, params });
+    return result;
   }
-  function applyVertexAttribute(modelId: string, surfaceIds: string[]) {
+  async function applyVertexAttribute(modelId: string, surfaceIds: string[]): Promise<unknown> {
     const name = modelSurfacesVertexAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesVertexAttributeItem(modelId, surfaceIds[0]);
     const storedConfig = modelSurfacesVertexAttributeStoredConfig(
@@ -212,57 +254,57 @@ function useModelSurfacesVertexAttribute() {
       no_data_color: storedConfig.no_data_color,
     };
     if (isModelSurfacesVertexAttributeValid(attribute)) {
-      return setModelSurfacesVertexAttribute(modelId, surfaceIds, attribute);
+      const result = await setModelSurfacesVertexAttribute(modelId, surfaceIds, attribute);
+      return result;
     }
-    return Promise.resolve();
+    return undefined;
   }
-  function setModelSurfacesVertexAttributeName(
+  async function setModelSurfacesVertexAttributeName(
     modelId: string,
     surfaceIds: string[],
     name: string,
-  ) {
+  ): Promise<unknown> {
     const item = modelSurfacesVertexAttributeLastItem(modelId, surfaceIds[0], name);
-    mutateModelSurfacesVertexStyle(modelId, surfaceIds, {
-      name,
-      item,
-    });
-    return applyVertexAttribute(modelId, surfaceIds);
+    await mutateModelSurfacesVertexStyle(modelId, surfaceIds, { name, item });
+    const result = await applyVertexAttribute(modelId, surfaceIds);
+    return result;
   }
-  function setModelSurfacesVertexAttributeItem(
+  async function setModelSurfacesVertexAttributeItem(
     modelId: string,
     surfaceIds: string[],
     item: number,
-  ) {
-    mutateModelSurfacesVertexStyle(modelId, surfaceIds, {
-      item,
-    });
-    return applyVertexAttribute(modelId, surfaceIds);
+  ): Promise<unknown> {
+    await mutateModelSurfacesVertexStyle(modelId, surfaceIds, { item });
+    const result = await applyVertexAttribute(modelId, surfaceIds);
+    return result;
   }
-  function setModelSurfacesVertexAttributeRange(
+  async function setModelSurfacesVertexAttributeRange(
     modelId: string,
     surfaceIds: string[],
     minimum: number,
     maximum: number,
-  ) {
+  ): Promise<unknown> {
     const name = modelSurfacesVertexAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesVertexAttributeItem(modelId, surfaceIds[0]);
-    setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
+    await setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
       minimum,
       maximum,
     });
-    return applyVertexAttribute(modelId, surfaceIds);
+    const result = await applyVertexAttribute(modelId, surfaceIds);
+    return result;
   }
-  function setModelSurfacesVertexAttributeColorMap(
+  async function setModelSurfacesVertexAttributeColorMap(
     modelId: string,
     surfaceIds: string[],
     colorMap: string | undefined,
-  ) {
+  ): Promise<unknown> {
     const name = modelSurfacesVertexAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesVertexAttributeItem(modelId, surfaceIds[0]);
-    setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
+    await setModelSurfacesVertexAttributeStoredConfig(modelId, surfaceIds, name, item, {
       colorMap,
     });
-    return applyVertexAttribute(modelId, surfaceIds);
+    const result = await applyVertexAttribute(modelId, surfaceIds);
+    return result;
   }
   function modelSurfacesVertexAttributeNoDataColor(modelId: string, surfaceId?: string): unknown {
     const name = modelSurfacesVertexAttributeName(modelId, surfaceId);
@@ -274,7 +316,7 @@ function useModelSurfacesVertexAttribute() {
     modelId: string,
     surfaceIds: string[],
     no_data_color: unknown,
-  ) {
+  ): Promise<unknown> {
     const name = modelSurfacesVertexAttributeName(modelId, surfaceIds[0]);
     const item = modelSurfacesVertexAttributeItem(modelId, surfaceIds[0]);
     const storedConfig = modelSurfacesVertexAttributeStoredConfig(
@@ -287,7 +329,8 @@ function useModelSurfacesVertexAttribute() {
       ...storedConfig,
       no_data_color,
     });
-    return applyVertexAttribute(modelId, surfaceIds);
+    const result = await applyVertexAttribute(modelId, surfaceIds);
+    return result;
   }
   return {
     modelSurfacesVertexAttributeName,
diff --git a/internal/stores/data_style/model/surfaces/visibility.ts b/internal/stores/data_style/model/surfaces/visibility.ts
index a2ca575f..a684cacc 100644
--- a/internal/stores/data_style/model/surfaces/visibility.ts
+++ b/internal/stores/data_style/model/surfaces/visibility.ts
@@ -4,7 +4,14 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.surfaces.visibility;
 
-export function useModelSurfacesVisibility() {
+export function useModelSurfacesVisibility(): {
+  setModelSurfacesVisibility: (
+    modelId: string,
+    surfaces_ids: readonly string[],
+    visibility: boolean | undefined,
+  ) => Promise<unknown>;
+  modelSurfaceVisibility: (id: string, surface_id?: string) => unknown;
+} {
   const modelCommonStyle = useModelCommonStyle();
   const modelSurfacesCommonStyle = useModelSurfacesCommonStyle();
 
@@ -12,12 +19,18 @@ export function useModelSurfacesVisibility() {
     return modelSurfacesCommonStyle.modelSurfaceStyle(id, surface_id).visibility;
   }
 
-  function setModelSurfacesVisibility(
+  async function setModelSurfacesVisibility(
     modelId: string,
-    surfaces_ids: string[],
+    surfaces_ids: readonly string[],
     visibility: boolean | undefined,
-  ) {
-    return modelCommonStyle.setModelTypeVisibility(modelId, surfaces_ids, visibility, schema);
+  ): Promise<unknown> {
+    const result = await modelCommonStyle.setModelTypeVisibility(
+      modelId,
+      [...surfaces_ids],
+      visibility,
+      schema,
+    );
+    return result;
   }
 
   return { setModelSurfacesVisibility, modelSurfaceVisibility };
diff --git a/internal/stores/data_style/model/visibility.ts b/internal/stores/data_style/model/visibility.ts
index 62bb267a..5ff5e08c 100644
--- a/internal/stores/data_style/model/visibility.ts
+++ b/internal/stores/data_style/model/visibility.ts
@@ -8,7 +8,7 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // The four per-component-type style composables (Surface/Line/Block/Corner) each expose a different, large set of methods (color, visibility, per-attribute-kind getters/setters...). This module only cares about looking a handful of them up dynamically by name, so a precise structural type for componentStyleFunctions isn't worth modelling here; `any` keeps the dynamic dispatch table honest about that.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// oxlint-disable-next-line no-explicit-any
 type ComponentStyleFunctions = Record<"Surface" | "Line" | "Block" | "Corner", any>;
 
 interface ModelComponent {
@@ -16,8 +16,21 @@ interface ModelComponent {
   type: string;
 }
 
+async function callComponentStyleFunction(
+  // oxlint-disable-next-line no-explicit-any
+  target: any,
+  method: string,
+  ...args: unknown[]
+): Promise<unknown> {
+  // oxlint-disable-next-line no-unsafe-call, no-unsafe-member-access, no-unsafe-argument, no-unsafe-assignment -- ComponentStyleFunctions is deliberately dynamically typed; see comment above.
+  const result = await target[method](...args);
+  return result;
+}
+
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model;
-async function getModelComponentsMap(modelId: string) {
+async function getModelComponentsMap(
+  modelId: string,
+): Promise<{ allComponents: ModelComponent[]; componentsMap: Record<string, ModelComponent> }> {
   const dataStore = useDataStore();
   const results = await Promise.all(
     MESH_COMPONENT_TYPES.map(async (type) => {
@@ -42,7 +55,7 @@ async function dispatchToComponentTypes(
   action: string,
   { componentStyleFunctions }: { componentStyleFunctions: ComponentStyleFunctions },
   ...args: unknown[]
-) {
+): Promise<unknown[]> {
   const { componentsMap } = await getModelComponentsMap(modelId);
   const idsByComponent: { Block: string[]; Surface: string[]; Line: string[]; Corner: string[] } = {
     Block: [],
@@ -52,15 +65,17 @@ async function dispatchToComponentTypes(
   };
   for (const id of componentIds) {
     const type = componentsMap[id]?.type;
-    if (type && type in idsByComponent) {
-      (idsByComponent as Record<string, string[]>)[type]!.push(id);
+    if (type !== undefined && type in idsByComponent) {
+      (idsByComponent as Record<string, string[]>)[type]?.push(id);
     }
   }
   const promises: Promise<unknown>[] = [];
   if (action === "Visibility") {
     if (idsByComponent.Block.length > 0) {
       promises.push(
-        componentStyleFunctions.Block.setModelBlocksVisibility(
+        callComponentStyleFunction(
+          componentStyleFunctions.Block,
+          "setModelBlocksVisibility",
           modelId,
           idsByComponent.Block,
           ...args,
@@ -69,7 +84,9 @@ async function dispatchToComponentTypes(
     }
     if (idsByComponent.Surface.length > 0) {
       promises.push(
-        componentStyleFunctions.Surface.setModelSurfacesVisibility(
+        callComponentStyleFunction(
+          componentStyleFunctions.Surface,
+          "setModelSurfacesVisibility",
           modelId,
           idsByComponent.Surface,
           ...args,
@@ -78,12 +95,20 @@ async function dispatchToComponentTypes(
     }
     if (idsByComponent.Line.length > 0) {
       promises.push(
-        componentStyleFunctions.Line.setModelLinesVisibility(modelId, idsByComponent.Line, ...args),
+        callComponentStyleFunction(
+          componentStyleFunctions.Line,
+          "setModelLinesVisibility",
+          modelId,
+          idsByComponent.Line,
+          ...args,
+        ),
       );
     }
     if (idsByComponent.Corner.length > 0) {
       promises.push(
-        componentStyleFunctions.Corner.setModelCornersVisibility(
+        callComponentStyleFunction(
+          componentStyleFunctions.Corner,
+          "setModelCornersVisibility",
           modelId,
           idsByComponent.Corner,
           ...args,
@@ -93,12 +118,20 @@ async function dispatchToComponentTypes(
   } else if (action === "Color") {
     if (idsByComponent.Block.length > 0) {
       promises.push(
-        componentStyleFunctions.Block.setModelBlocksColor(modelId, idsByComponent.Block, ...args),
+        callComponentStyleFunction(
+          componentStyleFunctions.Block,
+          "setModelBlocksColor",
+          modelId,
+          idsByComponent.Block,
+          ...args,
+        ),
       );
     }
     if (idsByComponent.Surface.length > 0) {
       promises.push(
-        componentStyleFunctions.Surface.setModelSurfacesColor(
+        callComponentStyleFunction(
+          componentStyleFunctions.Surface,
+          "setModelSurfacesColor",
           modelId,
           idsByComponent.Surface,
           ...args,
@@ -107,12 +140,20 @@ async function dispatchToComponentTypes(
     }
     if (idsByComponent.Line.length > 0) {
       promises.push(
-        componentStyleFunctions.Line.setModelLinesColor(modelId, idsByComponent.Line, ...args),
+        callComponentStyleFunction(
+          componentStyleFunctions.Line,
+          "setModelLinesColor",
+          modelId,
+          idsByComponent.Line,
+          ...args,
+        ),
       );
     }
     if (idsByComponent.Corner.length > 0) {
       promises.push(
-        componentStyleFunctions.Corner.setModelCornersColor(
+        callComponentStyleFunction(
+          componentStyleFunctions.Corner,
+          "setModelCornersColor",
           modelId,
           idsByComponent.Corner,
           ...args,
@@ -122,8 +163,27 @@ async function dispatchToComponentTypes(
   }
   return Promise.all(promises);
 }
+interface UseModelVisibilityStyleReturn {
+  modelVisibility: (modelId: string) => boolean | undefined;
+  setModelVisibility: (modelId: string, visibility: boolean) => Promise<unknown>;
+  setModelComponentsVisibility: (
+    modelId: string,
+    componentIds: string[],
+    visibility: boolean,
+  ) => Promise<unknown[]>;
+  setModelComponentTypeVisibility: (
+    modelId: string,
+    componentType: string,
+    visibility: boolean,
+  ) => Promise<void>;
+  modelComponentVisibility: (modelId: string, componentId: string) => boolean;
+  modelComponentTypeVisibility: (modelId: string, componentType: string) => boolean;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function useModelVisibilityStyle(componentStyleFunctions: ComponentStyleFunctions) {
+function useModelVisibilityStyle(
+  componentStyleFunctions: ComponentStyleFunctions,
+): UseModelVisibilityStyleReturn {
   const dataStore = useDataStore();
   const dataStyleState = useDataStyleState();
   const hybridViewerStore = useHybridViewerStore();
@@ -132,20 +192,20 @@ function useModelVisibilityStyle(componentStyleFunctions: ComponentStyleFunction
   function modelVisibility(modelId: string): boolean | undefined {
     return dataStyleState.getStyle(modelId).visibility;
   }
-  function setModelVisibility(modelId: string, visibility: boolean) {
+  async function setModelVisibility(modelId: string, visibility: boolean): Promise<unknown> {
     const schema = model_schemas.visibility;
     const params = {
       id: modelId,
       visibility,
     };
-    return viewerStore.request(
+    const result = await viewerStore.request(
       {
         schema,
         params,
       },
       {
         response_function: async () => {
-          await hybridViewerStore.setVisibility(modelId, visibility);
+          hybridViewerStore.setVisibility(modelId, visibility);
           await dataStyleState.mutateStyle(modelId, {
             visibility,
           });
@@ -156,12 +216,13 @@ function useModelVisibilityStyle(componentStyleFunctions: ComponentStyleFunction
         },
       },
     );
+    return result;
   }
   async function setModelComponentTypeVisibility(
     modelId: string,
     componentType: string,
     visibility: boolean,
-  ) {
+  ): Promise<void> {
     await modelCommonStyle.mutateModelComponentTypeStyle(modelId, componentType, {
       visibility,
     });
@@ -183,7 +244,7 @@ function useModelVisibilityStyle(componentStyleFunctions: ComponentStyleFunction
     modelId: string,
     componentIds: string[],
     visibility: boolean,
-  ) {
+  ): Promise<unknown[]> {
     const typeIds = componentIds.filter((id) => MESH_COMPONENT_TYPES.includes(id));
     const individualIds = componentIds.filter((id) => !MESH_COMPONENT_TYPES.includes(id));
     const promises: Promise<unknown>[] = [];
@@ -203,7 +264,8 @@ function useModelVisibilityStyle(componentStyleFunctions: ComponentStyleFunction
         ),
       );
     }
-    return await Promise.all(promises);
+    const results = await Promise.all(promises);
+    return results;
   }
   function modelComponentVisibility(modelId: string, componentId: string): boolean {
     const selection = useModelSelection(modelId, dataStyleState);
diff --git a/internal/stores/data_style/state.ts b/internal/stores/data_style/state.ts
index cfee4365..f6542530 100644
--- a/internal/stores/data_style/state.ts
+++ b/internal/stores/data_style/state.ts
@@ -1,17 +1,14 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import type {
   ModelComponentStyle,
   ModelComponentTypeStyle,
   ObjectStyle,
   StyleValues,
 } from "./types";
-import { database } from "@ogw_internal/database/database";
+import type { Observable as RxObservable } from "rxjs";
+import { getTable } from "@ogw_internal/database/database";
 import { liveQuery } from "dexie";
 import merge from "lodash/merge";
 import { useObservable } from "@vueuse/rxjs";
-import type { Ref } from "vue";
-import type { Observable as RxObservable } from "rxjs";
 
 interface SharedState {
   styles: Ref<Record<string, ObjectStyle>>;
@@ -21,23 +18,26 @@ interface SharedState {
   updateComponentStyleCache: (
     modelId: string,
     componentId: string,
-    styleValues: StyleValues,
+    styleValues: Readonly<StyleValues>,
   ) => void;
   bulkUpdateComponentStyleCache: (
     modelId: string,
-    componentStyleUpdates: { id_component: string; values: StyleValues }[],
+    componentStyleUpdates: readonly {
+      readonly id_component: string;
+      readonly values: Readonly<StyleValues>;
+    }[],
   ) => void;
   bulkUpdateComponentStylesCache: (
     modelId: string,
-    componentIds: string[],
-    styleValues: StyleValues,
+    componentIds: readonly string[],
+    styleValues: Readonly<StyleValues>,
   ) => void;
   updateModelComponentTypeStyleCache: (
     modelId: string,
     componentType: string,
-    styleValues: StyleValues,
+    styleValues: Readonly<StyleValues>,
   ) => void;
-  updateStyleCache: (objectId: string, styleValues: StyleValues) => void;
+  updateStyleCache: (objectId: string, styleValues: Readonly<StyleValues>) => void;
 }
 
 let sharedState: SharedState | undefined = undefined;
@@ -48,32 +48,37 @@ function getSharedState(): SharedState {
     return sharedState;
   }
 
-  const dataStyleTable = database.data_style!;
-  const modelComponentDataStyleTable = database.model_component_datastyle!;
-  const modelComponentTypeDataStyleTable = database.model_component_type_datastyle!;
+  const dataStyleTable = getTable<ObjectStyle>("data_style");
+  const modelComponentDataStyleTable = getTable<ModelComponentStyle>("model_component_datastyle");
+  const modelComponentTypeDataStyleTable = getTable<ModelComponentTypeStyle>(
+    "model_component_type_datastyle",
+  );
 
   // Dexie's `liveQuery` returns Dexie's own `Observable` type, structurally distinct
   // From rxjs's `Observable` that `useObservable` (from @vueuse/rxjs) expects, even
   // Though they're interoperable at runtime (both are plain subscribe-based streams).
+  const dataStyleLiveQuery = liveQuery(async () => {
+    const objectStyles = await dataStyleTable.toArray();
+    const stylesByObjectId: Record<string, ObjectStyle> = {};
+    for (const objectStyle of objectStyles) {
+      stylesByObjectId[objectStyle.id] = objectStyle;
+    }
+    return stylesByObjectId;
+  });
+
   const styles = useObservable<Record<string, ObjectStyle>, Record<string, ObjectStyle>>(
-    liveQuery(async () => {
-      const objectStyles = (await dataStyleTable.toArray()) as ObjectStyle[];
-      const stylesByObjectId: Record<string, ObjectStyle> = {};
-      for (const objectStyle of objectStyles) {
-        stylesByObjectId[objectStyle.id] = objectStyle;
-      }
-      return stylesByObjectId;
-    }) as unknown as RxObservable<Record<string, ObjectStyle>>,
+    // oxlint-disable-next-line no-unsafe-type-assertion
+    dataStyleLiveQuery as unknown as RxObservable<Record<string, ObjectStyle>>,
     { initialValue: {} },
   ) as Ref<Record<string, ObjectStyle>>;
 
   const modelComponentTypeStyles = ref<Record<string, ModelComponentTypeStyle>>({});
   const componentStyles = ref<Record<string, ModelComponentStyle>>({});
 
-  async function loadFromDatabase() {
+  async function loadFromDatabase(): Promise<void> {
     const [fetchedTypeStyles, fetchedComponentStyles] = await Promise.all([
-      modelComponentTypeDataStyleTable.toArray() as unknown as Promise<ModelComponentTypeStyle[]>,
-      modelComponentDataStyleTable.toArray() as unknown as Promise<ModelComponentStyle[]>,
+      modelComponentTypeDataStyleTable.toArray(),
+      modelComponentDataStyleTable.toArray(),
     ]);
     const typeStylesMap: Record<string, ModelComponentTypeStyle> = {};
     for (const typeStyle of fetchedTypeStyles) {
@@ -90,44 +95,43 @@ function getSharedState(): SharedState {
     componentStyles.value = componentStylesMap;
   }
 
-  loadFromDatabase();
+  void loadFromDatabase();
 
   function updateComponentStyleCache(
     modelId: string,
     componentId: string,
-    styleValues: StyleValues,
-  ) {
+    styleValues: Readonly<StyleValues>,
+  ): void {
     const cacheKey = `${modelId}_${componentId}`;
     const existingStyle = componentStyles.value[cacheKey];
-    if (existingStyle) {
-      merge(existingStyle, styleValues);
-    } else {
+    if (existingStyle === undefined) {
       componentStyles.value[cacheKey] = merge(
         { id_model: modelId, id_component: componentId },
         styleValues,
       );
+    } else {
+      merge(existingStyle, styleValues);
     }
   }
 
   function bulkUpdateComponentStyleCache(
     modelId: string,
-    componentStyleUpdates: { id_component: string; values: StyleValues }[],
-  ) {
+    componentStyleUpdates: readonly {
+      readonly id_component: string;
+      readonly values: Readonly<StyleValues>;
+    }[],
+  ): void {
     const updatedComponentStyles = { ...componentStyles.value };
     for (const { id_component: componentId, values: styleValues } of componentStyleUpdates) {
       const cacheKey = `${modelId}_${componentId}`;
       const existingStyle = updatedComponentStyles[cacheKey];
-      if (existingStyle) {
-        updatedComponentStyles[cacheKey] = merge(
-          {},
-          existingStyle,
-          styleValues,
-        ) as ModelComponentStyle;
-      } else {
+      if (existingStyle === undefined) {
         updatedComponentStyles[cacheKey] = merge(
           { id_model: modelId, id_component: componentId },
           styleValues,
         );
+      } else {
+        updatedComponentStyles[cacheKey] = merge({}, existingStyle, styleValues);
       }
     }
     componentStyles.value = updatedComponentStyles;
@@ -135,24 +139,20 @@ function getSharedState(): SharedState {
 
   function bulkUpdateComponentStylesCache(
     modelId: string,
-    componentIds: string[],
-    styleValues: StyleValues,
-  ) {
+    componentIds: readonly string[],
+    styleValues: Readonly<StyleValues>,
+  ): void {
     const updatedComponentStyles = { ...componentStyles.value };
     for (const componentId of componentIds) {
       const cacheKey = `${modelId}_${componentId}`;
       const existingStyle = updatedComponentStyles[cacheKey];
-      if (existingStyle) {
-        updatedComponentStyles[cacheKey] = merge(
-          {},
-          existingStyle,
-          styleValues,
-        ) as ModelComponentStyle;
-      } else {
+      if (existingStyle === undefined) {
         updatedComponentStyles[cacheKey] = merge(
           { id_model: modelId, id_component: componentId },
           styleValues,
         );
+      } else {
+        updatedComponentStyles[cacheKey] = merge({}, existingStyle, styleValues);
       }
     }
     componentStyles.value = updatedComponentStyles;
@@ -161,19 +161,15 @@ function getSharedState(): SharedState {
   function updateModelComponentTypeStyleCache(
     modelId: string,
     componentType: string,
-    styleValues: StyleValues,
-  ) {
+    styleValues: Readonly<StyleValues>,
+  ): void {
     const cacheKey = `${modelId}_${componentType}`;
-    if (!modelComponentTypeStyles.value[cacheKey]) {
-      modelComponentTypeStyles.value[cacheKey] = { id_model: modelId, type: componentType };
-    }
+    modelComponentTypeStyles.value[cacheKey] ??= { id_model: modelId, type: componentType };
     merge(modelComponentTypeStyles.value[cacheKey], styleValues);
   }
 
-  function updateStyleCache(objectId: string, styleValues: StyleValues) {
-    if (!styles.value[objectId]) {
-      styles.value[objectId] = { id: objectId };
-    }
+  function updateStyleCache(objectId: string, styleValues: Readonly<StyleValues>): void {
+    styles.value[objectId] ??= { id: objectId };
     merge(styles.value[objectId], styleValues);
   }
 
@@ -192,18 +188,30 @@ function getSharedState(): SharedState {
   return sharedState;
 }
 
+interface DataStyleStateApi extends SharedState {
+  getStyle: (objectId: string) => ObjectStyle;
+  getComponentStyle: (modelId: string, componentId: string) => ModelComponentStyle;
+  getModelComponentTypeStyle: (modelId: string, componentType: string) => ModelComponentTypeStyle;
+  mutateStyle: (objectId: string, styleValues: Readonly<StyleValues>) => Promise<string>;
+  objectVisibility: ComputedRef<(objectId: string) => boolean | undefined>;
+  selectedObjects: ComputedRef<string[]>;
+  clear: () => Promise<void>;
+}
+
 // oxlint-disable-next-line max-lines-per-function
-export function useDataStyleState() {
-  const dataStyleTable = database.data_style!;
-  const modelComponentDataStyleTable = database.model_component_datastyle!;
-  const modelComponentTypeDataStyleTable = database.model_component_type_datastyle!;
+export function useDataStyleState(): DataStyleStateApi {
+  const dataStyleTable = getTable<ObjectStyle>("data_style");
+  const modelComponentDataStyleTable = getTable<ModelComponentStyle>("model_component_datastyle");
+  const modelComponentTypeDataStyleTable = getTable<ModelComponentTypeStyle>(
+    "model_component_type_datastyle",
+  );
 
   const state = getSharedState();
   const { styles, modelComponentTypeStyles, componentStyles } = state;
 
   const objectVisibility = computed(() => (objectId: string): boolean | undefined => {
     const style = styles.value[objectId];
-    if (style) {
+    if (style !== undefined) {
       return style.visibility;
     }
     return false;
@@ -220,19 +228,29 @@ export function useDataStyleState() {
   });
 
   function getStyle(objectId: string): ObjectStyle {
-    return { ...toRaw(styles.value[objectId]) } as ObjectStyle;
+    const style = styles.value[objectId];
+    if (style === undefined) {
+      return { id: objectId };
+    }
+    return { ...toRaw(style) };
   }
 
-  function mutateStyle(objectId: string, styleValues: StyleValues) {
+  async function mutateStyle(
+    objectId: string,
+    styleValues: Readonly<StyleValues>,
+  ): Promise<string> {
     state.updateStyleCache(objectId, styleValues);
     const currentStyle = getStyle(objectId);
     merge(currentStyle, styleValues);
-    return dataStyleTable.put(structuredClone({ ...toRaw(currentStyle), id: objectId }));
+    const savedId = await dataStyleTable.put(
+      structuredClone({ ...toRaw(currentStyle), id: objectId }),
+    );
+    return savedId;
   }
 
   function getComponentStyle(modelId: string, componentId: string): ModelComponentStyle {
     const cacheKey = `${modelId}_${componentId}`;
-    return merge({ coloring: {} }, componentStyles.value[cacheKey]) as ModelComponentStyle;
+    return merge({ coloring: {} }, componentStyles.value[cacheKey]);
   }
 
   function getModelComponentTypeStyle(
@@ -240,10 +258,7 @@ export function useDataStyleState() {
     componentType: string,
   ): ModelComponentTypeStyle {
     const cacheKey = `${modelId}_${componentType}`;
-    return merge(
-      { coloring: {} },
-      modelComponentTypeStyles.value[cacheKey],
-    ) as ModelComponentTypeStyle;
+    return merge({ coloring: {} }, modelComponentTypeStyles.value[cacheKey]);
   }
 
   async function clear(): Promise<void> {
diff --git a/internal/stores/hybrid_viewer/brightness.ts b/internal/stores/hybrid_viewer/brightness.ts
index e2f322aa..1cc707e0 100644
--- a/internal/stores/hybrid_viewer/brightness.ts
+++ b/internal/stores/hybrid_viewer/brightness.ts
@@ -1,9 +1,5 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { BACKGROUND_GREY_VALUE, RGB_MAX } from "./constants";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { Ref } from "vue";
-import type { HybridViewerStorePublic } from "./vtk_types";
+import { useHybridViewerCore } from "./core";
 
 const RGBA_CHANNELS = 4;
 const SAMPLE_SIZE = 10;
@@ -25,7 +21,18 @@ interface BrightnessOptions {
   offscreenCanvas: HTMLCanvasElement | undefined;
 }
 
-function mapRect(rect: Rect, latestImage: DrawableImage, canvasRect: DOMRect) {
+interface RelativeRect {
+  relX: number;
+  relY: number;
+  relW: number;
+  relH: number;
+}
+
+function mapRect(
+  rect: Readonly<Rect>,
+  latestImage: Readonly<DrawableImage>,
+  canvasRect: Readonly<DOMRect>,
+): RelativeRect {
   const scaleX = latestImage.width / canvasRect.width;
   const scaleY = latestImage.height / canvasRect.height;
   return {
@@ -35,53 +42,71 @@ function mapRect(rect: Rect, latestImage: DrawableImage, canvasRect: DOMRect) {
     relH: rect.height * scaleY,
   };
 }
-function computeAverageBrightness(rect: Rect, options: BrightnessOptions): number {
+
+function sampleMinBrightness(
+  ctx: CanvasRenderingContext2D,
+  image: Readonly<DrawableImage>,
+  relRect: Readonly<RelativeRect>,
+): number {
+  ctx.drawImage(
+    image,
+    Math.max(0, relRect.relX),
+    Math.max(0, relRect.relY),
+    Math.min(image.width, relRect.relW),
+    Math.min(image.height, relRect.relH),
+    0,
+    0,
+    SAMPLE_SIZE,
+    SAMPLE_SIZE,
+  );
+  const { data } = ctx.getImageData(0, 0, SAMPLE_SIZE, SAMPLE_SIZE);
+  let minBrightness = 1;
+  for (let i = 0; i < TOTAL_CHANNELS; i += RGBA_CHANNELS) {
+    const brightness = ((data[i] ?? 0) + (data[i + 1] ?? 0) + (data[i + 2] ?? 0)) / (3 * RGB_MAX);
+    if (brightness < minBrightness) {
+      minBrightness = brightness;
+    }
+  }
+  return minBrightness;
+}
+
+function computeAverageBrightness(
+  rect: Readonly<Rect>,
+  options: Readonly<BrightnessOptions>,
+): number {
   const { latestImage, offscreenCtx, offscreenCanvas } = options;
-  const { genericRenderWindow } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+  const { genericRenderWindow } = useHybridViewerCore();
   if (!latestImage || !offscreenCtx || !offscreenCanvas || !genericRenderWindow.value) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
-  const canvas = genericRenderWindow.value.getApiSpecificRenderWindow().getCanvas();
-  if (!canvas) {
+  // oxlint-disable-next-line no-unsafe-assignment -- vtk.js has no types for getApiSpecificRenderWindow(); narrowed below.
+  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+  const apiSpecificRenderWindow = webGLRenderWindow as unknown as {
+    getCanvas: () => HTMLCanvasElement | null | undefined;
+  };
+  const canvas = apiSpecificRenderWindow.getCanvas();
+  if (canvas === undefined || canvas === null) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
   if (rect.width <= 0 || rect.height <= 0) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
-  const { relX, relY, relW, relH } = mapRect(rect, latestImage, canvas.getBoundingClientRect());
-  if (relW <= 0 || relH <= 0) {
+  const relRect = mapRect(rect, latestImage, canvas.getBoundingClientRect());
+  if (relRect.relW <= 0 || relRect.relH <= 0) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
   offscreenCanvas.width = SAMPLE_SIZE;
   offscreenCanvas.height = SAMPLE_SIZE;
   try {
-    offscreenCtx.drawImage(
-      latestImage,
-      Math.max(0, relX),
-      Math.max(0, relY),
-      Math.min(latestImage.width, relW),
-      Math.min(latestImage.height, relH),
-      0,
-      0,
-      SAMPLE_SIZE,
-      SAMPLE_SIZE,
-    );
-    const { data } = offscreenCtx.getImageData(0, 0, SAMPLE_SIZE, SAMPLE_SIZE);
-    let minBrightness = 1;
-    for (let i = 0; i < TOTAL_CHANNELS; i += RGBA_CHANNELS) {
-      const brightness = (data[i]! + data[i + 1]! + data[i + 2]!) / (3 * RGB_MAX);
-      if (brightness < minBrightness) {
-        minBrightness = brightness;
-      }
-    }
-    return minBrightness;
+    return sampleMinBrightness(offscreenCtx, latestImage, relRect);
   } catch {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
 }
 function useHybridViewerBrightness(): {
   latestImage: Ref<DrawableImage | undefined>;
-  getAverageBrightness: (rect: Rect) => number;
+  getAverageBrightness: (rect: Readonly<Rect>) => number;
 } {
   const latestImage = ref<DrawableImage | undefined>(undefined);
   const offscreenCanvas: HTMLCanvasElement | undefined =
@@ -91,7 +116,7 @@ function useHybridViewerBrightness(): {
         willReadFrequently: true,
       }) ?? undefined)
     : undefined;
-  function getAverageBrightness(rect: Rect): number {
+  function getAverageBrightness(rect: Readonly<Rect>): number {
     return computeAverageBrightness(rect, {
       latestImage: latestImage.value,
       offscreenCtx,
diff --git a/internal/stores/hybrid_viewer/camera.ts b/internal/stores/hybrid_viewer/camera.ts
index 1543dbe5..f4168cee 100644
--- a/internal/stores/hybrid_viewer/camera.ts
+++ b/internal/stores/hybrid_viewer/camera.ts
@@ -1,17 +1,15 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { CameraOptions, Vector3, vtkCamera, vtkOpenGLRenderWindow } from "./vtk_types";
 import {
   LONG_ANIMATION_DURATION,
   SHORT_ANIMATION_DURATION,
   animateCamera,
   computeAnimationDuration,
 } from "./camera_animation";
+import { requireRenderWindow, useHybridViewerCore } from "./core";
 import { dot } from "@kitware/vtk.js/Common/Core/Math";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useHybridViewerScene } from "./scene";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { Ref } from "vue";
-import type { CameraOptions, HybridViewerStorePublic, Vector3, vtkCamera } from "./vtk_types";
 
 const BUMP_MULTIPLIER = 0.2;
 const ALIGNMENT_THRESHOLD = 0.9;
@@ -49,26 +47,20 @@ const ORIENTATIONS: Record<string, OrientationConfig> = {
   },
 };
 
-// `genericRenderWindow.value` and its vtk objects are only ever read from these functions after the viewer has been initialized (see app/stores/hybrid_viewer.ts's initHybridViewer), so the non-null assertions below reflect that existing invariant rather than a new assumption.
-
-function getImageStyle(): unknown {
-  const { genericRenderWindow } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+function getImageStyle(): CSSStyleDeclaration | undefined {
+  const { genericRenderWindow } = useHybridViewerCore();
   if (!genericRenderWindow.value) {
     return undefined;
   }
-  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
-  if (!webGLRenderWindow) {
-    return undefined;
-  }
-  const bgImage = webGLRenderWindow.getReferenceByName("bgImage");
-  return bgImage ? bgImage.style : undefined;
+  // oxlint-disable-next-line no-unsafe-assignment -- vtk.js has no types for getApiSpecificRenderWindow(); narrowed below.
+  const apiSpecificRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+  const webGLRenderWindow = apiSpecificRenderWindow as unknown as vtkOpenGLRenderWindow;
+  const bgImage: unknown = webGLRenderWindow.getReferenceByName("bgImage");
+  return bgImage instanceof HTMLImageElement ? bgImage.style : undefined;
 }
 
-function getCameraOptions(camera: vtkCamera | undefined): CameraOptions | undefined {
-  if (!camera || !camera.getFocalPoint) {
-    // Dead branch in practice (a real vtkCamera always has getFocalPoint); kept for parity with the original defensive check.
-    return camera as CameraOptions | undefined;
-  }
+function getCameraOptions(camera: vtkCamera): CameraOptions {
   return {
     focal_point: [...(camera.getFocalPoint() ?? [0, 0, 0])] as Vector3,
     view_up: [...(camera.getViewUp() ?? [0, 0, 0])] as Vector3,
@@ -79,38 +71,11 @@ function getCameraOptions(camera: vtkCamera | undefined): CameraOptions | undefi
   };
 }
 
-function performSyncRemoteCamera(): void {
-  const { genericRenderWindow, camera_options, remoteRender } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  const viewerStore = useViewerStore();
-  const renderer = genericRenderWindow.value!.getRenderer();
-  const camera = renderer.getActiveCamera();
-  const options_camera = getCameraOptions(camera);
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.update_camera;
-  const params = {
-    camera_options: options_camera,
-  };
-  viewerStore.request(
-    {
-      schema,
-      params,
-    },
-    {
-      response_function: () => {
-        remoteRender();
-        if (camera_options) {
-          Object.assign(camera_options, options_camera);
-        }
-      },
-    },
-  );
-}
-
 function applyCameraOptions(
   camera: vtkCamera | undefined,
-  options: CameraOptions | undefined,
+  options: Partial<CameraOptions> | undefined,
 ): void {
-  if (camera && camera.set && options) {
+  if (camera && options) {
     camera.set({
       focalPoint: options.focal_point,
       viewUp: options.view_up,
@@ -121,136 +86,198 @@ function applyCameraOptions(
   }
 }
 
-function performSetCamera(targetCameraOptions: CameraOptions): void {
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow } = hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { is_moving } = storeToRefs(hybridViewerStore) as unknown as { is_moving: Ref<boolean> };
-  const imageStyle = getImageStyle() as { opacity: number } | undefined;
-  const renderer = genericRenderWindow.value!.getRenderer();
-  const camera = renderer.getActiveCamera();
-  const startState = getCameraOptions(camera);
-  const duration = computeAnimationDuration(startState!, targetCameraOptions);
-  is_moving.value = true;
-  if (imageStyle) {
-    imageStyle.opacity = 0;
-  }
-  animateCamera({
-    camera,
-    startState: startState!,
-    targetState: targetCameraOptions,
-    duration,
-    bumpMultiplier: 0,
-    easeExponent: EASE_EXPONENT,
-    onUpdate: () => {
-      const renderWindow = genericRenderWindow.value!.getRenderWindow();
-      renderWindow.render();
-    },
-    onEnd: () => {
-      applyCameraOptions(camera, targetCameraOptions);
-      const renderWindow = genericRenderWindow.value!.getRenderWindow();
-      renderWindow.render();
-      is_moving.value = false;
-      performSyncRemoteCamera();
-    },
-  });
+const BOUNDS_LENGTH = 6;
+
+function isBounds(value: unknown): value is [number, number, number, number, number, number] {
+  return (
+    Array.isArray(value) &&
+    value.length === BOUNDS_LENGTH &&
+    value.every((item): item is number => typeof item === "number")
+  );
 }
 
-async function performFocusCameraOnObject(id: string, block_ids: string[] = []): Promise<void> {
-  const { genericRenderWindow, hybridDb } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  if (!hybridDb[id]) {
-    return;
+function toBounds(value: unknown): [number, number, number, number, number, number] {
+  if (!isBounds(value)) {
+    throw new Error("Expected a six-element numeric bounds array");
   }
-  const viewerStore = useViewerStore();
-  let bounds: number[] = [];
-  if (block_ids.length > 0) {
-    const schema = viewer_schemas.opengeodeweb_viewer.model.get_blocks_bounds;
-    const params = {
-      id,
-      block_ids,
-    };
-    bounds = (await viewerStore.request({
-      schema,
-      params,
-    })) as number[];
-  } else {
-    bounds = hybridDb[id].actor.getBounds();
-  }
-  const renderer = genericRenderWindow.value!.getRenderer();
-  const camera = renderer.getActiveCamera();
-  const startOptions = getCameraOptions(camera);
-  renderer.resetCamera(bounds as [number, number, number, number, number, number]);
-  const targetOptions = getCameraOptions(camera);
-  applyCameraOptions(camera, startOptions);
-  performSetCamera(targetOptions!);
+  return value;
 }
 
-function performCameraOrientation(orientation: string): void {
-  const config = ORIENTATIONS[orientation.toLowerCase()];
-  if (!config) {
+function centerCameraOnPosition(
+  camera: vtkCamera | undefined,
+  pickedPosition: Vector3 | undefined,
+): void {
+  if (!camera || !pickedPosition) {
     return;
   }
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow } = hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { is_moving } = storeToRefs(hybridViewerStore) as unknown as { is_moving: Ref<boolean> };
-  const imageStyle = getImageStyle() as { opacity: number } | undefined;
-  const renderer = genericRenderWindow.value!.getRenderer();
-  const camera = renderer.getActiveCamera();
-  const startState = getCameraOptions(camera);
-  applyCameraOptions(camera, {
-    ...config,
-    focal_point: [0, 0, 0],
-  } as CameraOptions);
-  renderer.resetCamera();
-  const targetState = getCameraOptions(camera);
-  applyCameraOptions(camera, startState);
-  const alignment = dot(camera.getDirectionOfProjection(), config.position);
-  const duration =
-    alignment > ALIGNMENT_THRESHOLD ? LONG_ANIMATION_DURATION : SHORT_ANIMATION_DURATION;
-  is_moving.value = true;
-  if (imageStyle) {
-    imageStyle.opacity = 0;
-  }
-  animateCamera({
-    camera,
-    startState: startState!,
-    targetState: targetState!,
-    duration,
-    bumpMultiplier: BUMP_MULTIPLIER,
-    easeExponent: EASE_EXPONENT,
-    onUpdate: () => {
-      const renderWindow = genericRenderWindow.value!.getRenderWindow();
-      renderWindow.render();
-    },
-    onEnd: () => {
-      is_moving.value = false;
-      performSyncRemoteCamera();
-    },
-  });
+  const focalPoint = camera.getFocalPoint();
+  const position = camera.getPosition();
+  camera.setFocalPoint(...pickedPosition);
+  camera.setPosition(
+    position[0] + pickedPosition[0] - focalPoint[0],
+    position[1] + pickedPosition[1] - focalPoint[1],
+    position[2] + pickedPosition[2] - focalPoint[2],
+  );
 }
 
-function useHybridViewerCamera() {
+// Shared via createSharedComposable (rather than merged into the parent hybridViewer store) so sibling slices, e.g. viewport.ts and ruler.ts, can read camera_options/setCamera/syncRemoteCamera directly without importing the parent store and creating a cycle. A Pinia store would work too but its $id/$patch/... properties would leak into the composed store's spread and collapse its inferred type.
+const useHybridViewerCamera = createSharedComposable(() => {
   const camera_options = reactive<Record<string, unknown>>({});
+
+  function performSyncRemoteCamera(): void {
+    const { genericRenderWindow, remoteRender } = useHybridViewerCore();
+    const viewerStore = useViewerStore();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    const camera = renderer.getActiveCamera();
+    const options_camera = getCameraOptions(camera);
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.update_camera;
+    const params = {
+      camera_options: options_camera,
+    };
+    viewerStore
+      .request(
+        {
+          schema,
+          params,
+        },
+        {
+          response_function: async () => {
+            await remoteRender().catch(() => undefined);
+            Object.assign(camera_options, options_camera);
+          },
+        },
+      )
+      // oxlint-disable-next-line promise/prefer-await-to-then -- fire-and-forget inside a sync caller; see codebase convention in global_attribute_style.ts.
+      .catch(() => undefined);
+  }
+
   function syncRemoteCamera(): void {
     performSyncRemoteCamera();
   }
+
+  function performSetCamera(targetCameraOptions: CameraOptions): void {
+    const { genericRenderWindow, is_moving } = useHybridViewerCore();
+    const imageStyle = getImageStyle();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    const camera = renderer.getActiveCamera();
+    const startState = getCameraOptions(camera);
+    const duration = computeAnimationDuration(startState, targetCameraOptions);
+    is_moving.value = true;
+    if (imageStyle) {
+      imageStyle.opacity = "0";
+    }
+    animateCamera({
+      camera,
+      startState,
+      targetState: targetCameraOptions,
+      duration,
+      bumpMultiplier: 0,
+      easeExponent: EASE_EXPONENT,
+      onUpdate: () => {
+        const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+        renderWindow.render();
+      },
+      onEnd: () => {
+        applyCameraOptions(camera, targetCameraOptions);
+        const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+        renderWindow.render();
+        is_moving.value = false;
+        performSyncRemoteCamera();
+      },
+    });
+  }
+
   function setCamera(targetCameraOptions: CameraOptions): void {
     performSetCamera(targetCameraOptions);
   }
+
   function resetCamera(): void {
-    const { genericRenderWindow } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
-    const renderer = genericRenderWindow.value!.getRenderer();
+    const { genericRenderWindow } = useHybridViewerCore();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
     renderer.resetCamera();
-    const renderWindow = genericRenderWindow.value!.getRenderWindow();
+    const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
     renderWindow.render();
     syncRemoteCamera();
   }
+
+  async function performFocusCameraOnObject(id: string, block_ids: string[] = []): Promise<void> {
+    const { genericRenderWindow } = useHybridViewerCore();
+    const { hybridDb } = useHybridViewerScene();
+    if (!hybridDb[id]) {
+      return;
+    }
+    const viewerStore = useViewerStore();
+    const bounds: [number, number, number, number, number, number] =
+      block_ids.length > 0
+        ? toBounds(
+            await viewerStore.request({
+              schema: viewer_schemas.opengeodeweb_viewer.model.get_blocks_bounds,
+              params: {
+                id,
+                block_ids,
+              },
+            }),
+          )
+        : hybridDb[id].actor.getBounds();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    const camera = renderer.getActiveCamera();
+    const startOptions = getCameraOptions(camera);
+    renderer.resetCamera(bounds);
+    const targetOptions = getCameraOptions(camera);
+    applyCameraOptions(camera, startOptions);
+    performSetCamera(targetOptions);
+  }
+
   async function focusCameraOnObject(id: string, block_ids: string[] = []): Promise<void> {
     await performFocusCameraOnObject(id, block_ids);
   }
+
+  function performCameraOrientation(orientation: string): void {
+    const config = ORIENTATIONS[orientation.toLowerCase()];
+    if (!config) {
+      return;
+    }
+    const { genericRenderWindow, is_moving } = useHybridViewerCore();
+    const imageStyle = getImageStyle();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    const camera = renderer.getActiveCamera();
+    const startState = getCameraOptions(camera);
+    applyCameraOptions(camera, {
+      ...config,
+      focal_point: [0, 0, 0],
+    });
+    renderer.resetCamera();
+    const targetState = getCameraOptions(camera);
+    applyCameraOptions(camera, startState);
+    const alignment = dot(camera.getDirectionOfProjection(), config.position);
+    const duration =
+      alignment > ALIGNMENT_THRESHOLD ? LONG_ANIMATION_DURATION : SHORT_ANIMATION_DURATION;
+    is_moving.value = true;
+    if (imageStyle) {
+      imageStyle.opacity = "0";
+    }
+    animateCamera({
+      camera,
+      startState,
+      targetState,
+      duration,
+      bumpMultiplier: BUMP_MULTIPLIER,
+      easeExponent: EASE_EXPONENT,
+      onUpdate: () => {
+        const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+        renderWindow.render();
+      },
+      onEnd: () => {
+        is_moving.value = false;
+        performSyncRemoteCamera();
+      },
+    });
+  }
+
   function setCameraOrientation(orientation: string): void {
     performCameraOrientation(orientation);
   }
+
   return {
     camera_options,
     syncRemoteCamera,
@@ -259,24 +286,7 @@ function useHybridViewerCamera() {
     focusCameraOnObject,
     setCameraOrientation,
   };
-}
-
-function centerCameraOnPosition(
-  camera: vtkCamera | undefined,
-  pickedPosition: Vector3 | undefined,
-): void {
-  if (!camera || !pickedPosition) {
-    return;
-  }
-  const focalPoint = camera.getFocalPoint();
-  const position = camera.getPosition();
-  camera.setFocalPoint(...pickedPosition);
-  camera.setPosition(
-    position[0] + pickedPosition[0] - focalPoint[0],
-    position[1] + pickedPosition[1] - focalPoint[1],
-    position[2] + pickedPosition[2] - focalPoint[2],
-  );
-}
+});
 
 interface CameraSnapshot {
   zScale?: number;
@@ -287,12 +297,11 @@ async function applySnapshot(snapshot: CameraSnapshot | undefined): Promise<void
   if (!snapshot) {
     return;
   }
-  const { setZScaling, setCamera } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
   if (typeof snapshot.zScale === "number") {
-    await setZScaling(snapshot.zScale);
+    await useHybridViewerScene().setZScaling(snapshot.zScale);
   }
   if (snapshot.camera_options) {
-    setCamera(snapshot.camera_options);
+    useHybridViewerCamera().setCamera(snapshot.camera_options);
   }
 }
 export {
@@ -304,9 +313,6 @@ export {
   applySnapshot,
   centerCameraOnPosition,
   getCameraOptions,
-  performCameraOrientation,
-  performFocusCameraOnObject,
-  performSetCamera,
-  performSyncRemoteCamera,
   useHybridViewerCamera,
 };
+export type { CameraSnapshot };
diff --git a/internal/stores/hybrid_viewer/camera_animation.ts b/internal/stores/hybrid_viewer/camera_animation.ts
index 7eeaffd9..e458c0ba 100644
--- a/internal/stores/hybrid_viewer/camera_animation.ts
+++ b/internal/stores/hybrid_viewer/camera_animation.ts
@@ -1,7 +1,5 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { dot } from "@kitware/vtk.js/Common/Core/Math";
 import type { CameraOptions, Vector3, vtkCamera } from "./vtk_types";
+import { dot } from "@kitware/vtk.js/Common/Core/Math";
 
 const NEAR_ZERO_THRESHOLD = 1e-10;
 const SLERP_LINEAR_THRESHOLD = 0.9995;
@@ -117,15 +115,18 @@ function animateCamera(options: AnimateCameraOptions): void {
     const bump = bumpMultiplier * Math.sin(Math.PI * progress);
     const dir = slerp(startDir, targetDir, ease, antipodalMid);
     const dist = startDist + (targetDist - startDist) * ease + bump;
-    // `index` ranges over startState.focal_point's own length (3), which always
-    // Matches targetState.focal_point's length, so the lookup is always in bounds.
-    const focalPoint = startState.focal_point.map(
-      (startValue, index) => startValue + (targetState.focal_point[index]! - startValue) * ease,
-    );
+    const focalPoint: Vector3 = [
+      startState.focal_point[0] + (targetState.focal_point[0] - startState.focal_point[0]) * ease,
+      startState.focal_point[1] + (targetState.focal_point[1] - startState.focal_point[1]) * ease,
+      startState.focal_point[2] + (targetState.focal_point[2] - startState.focal_point[2]) * ease,
+    ];
     const viewUp = slerp(startState.view_up, targetState.view_up, ease);
     camera.set({
-      // Same reasoning: `index` ranges over focalPoint's length, matching `dir`'s length (3).
-      position: focalPoint.map((focalCoord, index) => focalCoord + dir[index]! * dist),
+      position: [
+        focalPoint[0] + dir[0] * dist,
+        focalPoint[1] + dir[1] * dist,
+        focalPoint[2] + dir[2] * dist,
+      ],
       viewUp,
       focalPoint,
     });
diff --git a/internal/stores/hybrid_viewer/core.ts b/internal/stores/hybrid_viewer/core.ts
new file mode 100644
index 00000000..d261b979
--- /dev/null
+++ b/internal/stores/hybrid_viewer/core.ts
@@ -0,0 +1,64 @@
+import { Status } from "@ogw_front/utils/status";
+import type { ViewStreamLike } from "./vtk_types";
+import type { vtkGenericRenderWindow as VtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+
+interface GenericRenderWindowHolder {
+  value?: VtkGenericRenderWindow;
+}
+
+// `genericRenderWindow.value` is only ever read from these functions after the viewer has been initialized (see app/stores/hybrid_viewer.ts's initHybridViewer), so requireRenderWindow throwing on that path would indicate a real bug rather than an expected state.
+function requireRenderWindow(holder: Readonly<GenericRenderWindowHolder>): VtkGenericRenderWindow {
+  if (!holder.value) {
+    throw new Error("genericRenderWindow accessed before the viewer was initialized");
+  }
+  return holder.value;
+}
+
+// Render-window, status and drag/pick state shared across the hybrid viewer's slice composables (app/stores/hybrid_viewer.ts and internal/stores/hybrid_viewer/*), plus the debounced remote-render call they all trigger. Shared via createSharedComposable (a singleton per mounted tree, not a Pinia store) so those slices can depend on it directly instead of on the composed hybridViewer store, which would create an import cycle; a real Pinia store here would also pull its own $id/$patch/... properties into the composed store's spread and collapse its inferred type.
+const useHybridViewerCore = createSharedComposable(() => {
+  const genericRenderWindow = reactive<GenericRenderWindowHolder>({});
+  const status = ref(Status.NOT_CREATED);
+  const is_moving = ref(false);
+  const is_picking = ref(false);
+  const viewStream = ref<ViewStreamLike | undefined>(undefined);
+
+  let renderPromise: Promise<void> | undefined = undefined;
+  let renderPending = false;
+
+  async function remoteRender(): Promise<void> {
+    if (renderPromise) {
+      renderPending = true;
+      await renderPromise;
+      return;
+    }
+
+    renderPromise = (async (): Promise<void> => {
+      try {
+        const viewerStore = useViewerStore();
+        const schema = viewer_schemas.opengeodeweb_viewer.viewer.render;
+        await viewerStore.request({ schema });
+      } finally {
+        renderPromise = undefined;
+        if (renderPending) {
+          renderPending = false;
+          await remoteRender();
+        }
+      }
+    })();
+    return renderPromise;
+  }
+
+  return {
+    genericRenderWindow,
+    status,
+    is_moving,
+    is_picking,
+    viewStream,
+    remoteRender,
+  };
+});
+
+export { requireRenderWindow, useHybridViewerCore };
+export type { GenericRenderWindowHolder };
diff --git a/internal/stores/hybrid_viewer/filters.ts b/internal/stores/hybrid_viewer/filters.ts
index ec784cf7..d820ef69 100644
--- a/internal/stores/hybrid_viewer/filters.ts
+++ b/internal/stores/hybrid_viewer/filters.ts
@@ -1,13 +1,10 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useHybridViewerCore } from "./core";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { HybridViewerStorePublic } from "./vtk_types";
 
 async function performSetClippingPlanes(ids: string[], planes: unknown): Promise<void> {
   const viewerStore = useViewerStore();
-  const { remoteRender } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+  const { remoteRender } = useHybridViewerCore();
   const schema = viewer_schemas.opengeodeweb_viewer.viewer.clipping_planes;
   const params = {
     ids,
@@ -21,7 +18,7 @@ async function performSetClippingPlanes(ids: string[], planes: unknown): Promise
 }
 async function performSetShrink(ids: string[], shrink_factor: number): Promise<void> {
   const viewerStore = useViewerStore();
-  const { remoteRender } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+  const { remoteRender } = useHybridViewerCore();
   const schema = viewer_schemas.opengeodeweb_viewer.viewer.shrink;
   const params = {
     ids,
@@ -33,7 +30,10 @@ async function performSetShrink(ids: string[], shrink_factor: number): Promise<v
   });
   await remoteRender();
 }
-function useHybridViewerFilters() {
+function useHybridViewerFilters(): {
+  setClippingPlanes: (ids: string[], planes: unknown) => Promise<void>;
+  setShrink: (ids: string[], shrink_factor: number) => Promise<void>;
+} {
   async function setClippingPlanes(ids: string[], planes: unknown): Promise<void> {
     await performSetClippingPlanes(ids, planes);
   }
diff --git a/internal/stores/hybrid_viewer/highlight.ts b/internal/stores/hybrid_viewer/highlight.ts
index 1a3a011d..11d925d4 100644
--- a/internal/stores/hybrid_viewer/highlight.ts
+++ b/internal/stores/hybrid_viewer/highlight.ts
@@ -1,95 +1,80 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 import { HOVER_DEBOUNCE_MS, HOVER_TIMEOUT_MS } from "./constants";
+import type { HoverComponentInfo, HoverData } from "./vtk_types";
+import type { IndexableType } from "dexie";
 import { database } from "@ogw_internal/database/database.js";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useHybridViewerCore } from "./core";
+import { useHybridViewerScene } from "./scene";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { IndexableType } from "dexie";
-import type { Ref } from "vue";
-import type { HoverComponentInfo, HoverData, HybridViewerStorePublic } from "./vtk_types";
 
 // The dynamic/RPC-shaped payload of the viewer's "highlight" schema response.
 interface HighlightResponse {
   id?: string;
   picked_id?: number;
   field_type?: string;
-  geode_id?: string;
+  geode_id?: string | null;
   attributes?: Record<string, unknown>;
 }
 
-function createClearHoverData(
-  hoverTimeoutRef: Ref<ReturnType<typeof setTimeout> | undefined>,
-  hoverData: Ref<HoverData | undefined>,
-  currentHoverId: Ref<string | undefined>,
-) {
-  return function clearHoverData(): void {
+// Shared via createSharedComposable (rather than merged into the parent hybridViewer store) so sibling slices, e.g. ruler.ts and viewport.ts, can read hover state/clearHoverHighlight/hoverHighlight directly without importing the parent store and creating a cycle. A Pinia store would work too but its $id/$patch/... properties would leak into the composed store's spread and collapse its inferred type.
+const useHybridViewerHighlight = createSharedComposable(() => {
+  const is_hover_highlight = ref(false);
+  const hover_highlight_field_type = ref("CELL");
+  const hoverData = ref<HoverData | undefined>(undefined);
+  const hoverPosition = ref({
+    x: 0,
+    y: 0,
+  });
+  const hoverTimeoutRef = ref<ReturnType<typeof setTimeout> | undefined>(undefined);
+  const currentHoverId = ref<string | undefined>(undefined);
+
+  function clearHoverData(): void {
     if (hoverTimeoutRef.value) {
       clearTimeout(hoverTimeoutRef.value);
       hoverTimeoutRef.value = undefined;
     }
     hoverData.value = undefined;
     currentHoverId.value = undefined;
-  };
-}
-
-function performHoverHighlight(
-  event: MouseEvent,
-  onResponse: (response: unknown) => void | Promise<void>,
-): void {
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow, hybridDb } = hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { is_hover_highlight, hover_highlight_field_type } = storeToRefs(
-    hybridViewerStore,
-  ) as unknown as { is_hover_highlight: Ref<boolean>; hover_highlight_field_type: Ref<string> };
-  if (!is_hover_highlight.value) {
-    return;
-  }
-  const container = genericRenderWindow.value?.getContainer();
-  if (!container) {
-    return;
   }
-  const viewerStore = useViewerStore();
-  const rect = container.getBoundingClientRect();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
-  const params = {
-    x: Math.round(event.clientX - rect.left),
-    y: Math.round(rect.height - (event.clientY - rect.top)),
-    field_type: hover_highlight_field_type.value,
-    ids: Object.keys(hybridDb),
-  };
-  viewerStore.request(
-    {
-      schema,
-      params,
-    },
-    {
-      response_function: onResponse,
-    },
-  );
-}
 
-interface CreateHoverHighlightParams {
-  hoverTimeoutRef: Ref<ReturnType<typeof setTimeout> | undefined>;
-  currentHoverId: Ref<string | undefined>;
-  clearHoverData: () => void;
-}
-
-function createHoverHighlight({
-  hoverTimeoutRef,
-  currentHoverId,
-  clearHoverData,
-}: CreateHoverHighlightParams) {
-  return useDebounceFn((event: MouseEvent) => {
-    const hybridViewerStore = useHybridViewerStore();
-    const { genericRenderWindow } = hybridViewerStore as unknown as HybridViewerStorePublic;
-    const { is_hover_highlight, hoverData, hoverPosition } = storeToRefs(
-      hybridViewerStore,
-    ) as unknown as {
-      is_hover_highlight: Ref<boolean>;
-      hoverData: Ref<HoverData | undefined>;
-      hoverPosition: Ref<{ x: number; y: number }>;
+  function requestHoverHighlight(
+    event: MouseEvent,
+    onResponse: (response: unknown) => void | Promise<void>,
+  ): void {
+    if (!is_hover_highlight.value) {
+      return;
+    }
+    const { genericRenderWindow } = useHybridViewerCore();
+    const { hybridDb } = useHybridViewerScene();
+    const container = genericRenderWindow.value?.getContainer();
+    if (!container) {
+      return;
+    }
+    const viewerStore = useViewerStore();
+    const rect = container.getBoundingClientRect();
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
+    const params = {
+      x: Math.round(event.clientX - rect.left),
+      y: Math.round(rect.height - (event.clientY - rect.top)),
+      field_type: hover_highlight_field_type.value,
+      ids: Object.keys(hybridDb),
     };
+    viewerStore
+      .request(
+        {
+          schema,
+          params,
+        },
+        {
+          response_function: onResponse,
+        },
+      )
+      // oxlint-disable-next-line promise/prefer-await-to-then -- fire-and-forget inside a sync caller; see codebase convention in global_attribute_style.ts.
+      .catch(() => undefined);
+  }
+
+  const hoverHighlight = useDebounceFn((event: MouseEvent) => {
+    const { genericRenderWindow } = useHybridViewerCore();
     const containerElement = genericRenderWindow.value?.getContainer();
     const relativeMousePosition = containerElement
       ? {
@@ -100,11 +85,16 @@ function createHoverHighlight({
           x: event.clientX,
           y: event.clientY,
         };
-    performHoverHighlight(event, async (rawResponse: unknown) => {
+    requestHoverHighlight(event, async (rawResponse: unknown) => {
+      // oxlint-disable-next-line no-unsafe-type-assertion -- trusted viewer RPC response boundary.
       const response = rawResponse as HighlightResponse | undefined;
-      const isResponseValid =
-        response && response.id && response.picked_id !== undefined && response.picked_id !== -1;
-      if (!is_hover_highlight.value || !isResponseValid) {
+      if (
+        !is_hover_highlight.value ||
+        response === undefined ||
+        response.id === undefined ||
+        response.picked_id === undefined ||
+        response.picked_id === -1
+      ) {
         clearHoverData();
         return;
       }
@@ -120,19 +110,14 @@ function createHoverHighlight({
       currentHoverId.value = hoverKey;
       let componentInfo: HoverComponentInfo | undefined = undefined;
       let modelName: string | undefined = undefined;
-      const modelRecord = (await database.data?.get(response.id as string)) as
-        | { name?: string }
-        | undefined;
+      const modelRecord = (await database.data?.get(response.id)) as { name?: string } | undefined;
       if (modelRecord) {
         modelName = modelRecord.name;
       }
       const modelComponentsTable = database.model_components;
-      if (response.geode_id && modelComponentsTable) {
+      if (response.geode_id !== undefined && response.geode_id !== null && modelComponentsTable) {
         const components = modelComponentsTable.where("[id+geode_id]");
-        const query = components.equals([
-          response.id as string,
-          response.geode_id,
-        ] as IndexableType);
+        const query = components.equals([response.id, response.geode_id] as IndexableType);
         const component = (await query.first()) as
           | { name?: string; geode_id?: string; type?: string }
           | undefined;
@@ -145,13 +130,13 @@ function createHoverHighlight({
         }
       }
       const newHoverData: HoverData = {
-        modelId: response.id as string,
+        modelId: response.id,
         modelName,
-        blockName: response.geode_id,
+        blockName: response.geode_id ?? undefined,
         pickedId: response.picked_id,
         fieldType: response.field_type,
         component: componentInfo,
-        attributes: response.attributes || {},
+        attributes: response.attributes ?? {},
       };
       hoverTimeoutRef.value = setTimeout(() => {
         hoverPosition.value = relativeMousePosition;
@@ -160,47 +145,29 @@ function createHoverHighlight({
       }, HOVER_TIMEOUT_MS);
     });
   }, HOVER_DEBOUNCE_MS);
-}
-function performClearHoverHighlight(): void {
-  const hybridViewerStore = useHybridViewerStore();
-  const { hybridDb } = hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { hover_highlight_field_type } = storeToRefs(hybridViewerStore) as unknown as {
-    hover_highlight_field_type: Ref<string>;
-  };
-  const viewerStore = useViewerStore();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
-  const params = {
-    x: -1,
-    y: -1,
-    field_type: hover_highlight_field_type.value,
-    ids: Object.keys(hybridDb),
-  };
-  viewerStore.request({
-    schema,
-    params,
-  });
-}
 
-function useHybridViewerHighlight() {
-  const is_hover_highlight = ref(false);
-  const hover_highlight_field_type = ref("CELL");
-  const hoverData = ref<HoverData | undefined>(undefined);
-  const hoverPosition = ref({
-    x: 0,
-    y: 0,
-  });
-  const hoverTimeoutRef = ref<ReturnType<typeof setTimeout> | undefined>(undefined);
-  const currentHoverId = ref<string | undefined>(undefined);
-  const clearHoverData = createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId);
-  const hoverHighlight = createHoverHighlight({
-    hoverTimeoutRef,
-    currentHoverId,
-    clearHoverData,
-  });
+  function requestClearHoverHighlight(): void {
+    const { hybridDb } = useHybridViewerScene();
+    const viewerStore = useViewerStore();
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
+    const params = {
+      x: -1,
+      y: -1,
+      field_type: hover_highlight_field_type.value,
+      ids: Object.keys(hybridDb),
+    };
+    viewerStore
+      .request({
+        schema,
+        params,
+      })
+      // oxlint-disable-next-line promise/prefer-await-to-then -- fire-and-forget inside a sync caller; see codebase convention in global_attribute_style.ts.
+      .catch(() => undefined);
+  }
 
   function clearHoverHighlight(): void {
     clearHoverData();
-    performClearHoverHighlight();
+    requestClearHoverHighlight();
   }
 
   return {
@@ -211,12 +178,6 @@ function useHybridViewerHighlight() {
     clearHoverHighlight,
     hoverHighlight,
   };
-}
+});
 
-export {
-  createClearHoverData,
-  createHoverHighlight,
-  performClearHoverHighlight,
-  performHoverHighlight,
-  useHybridViewerHighlight,
-};
+export { useHybridViewerHighlight };
diff --git a/internal/stores/hybrid_viewer/ruler.ts b/internal/stores/hybrid_viewer/ruler.ts
index 91ceea80..4ef82445 100644
--- a/internal/stores/hybrid_viewer/ruler.ts
+++ b/internal/stores/hybrid_viewer/ruler.ts
@@ -1,17 +1,26 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useHybridViewerCore } from "./core";
+import { useHybridViewerHighlight } from "./highlight";
+import { useHybridViewerScene } from "./scene";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { Ref } from "vue";
-import type { HybridViewerStorePublic } from "./vtk_types";
 
 interface RulerHoverState {
   active: boolean;
   fieldType: string;
 }
 
-function useHybridViewerRuler() {
+function useHybridViewerRuler(): {
+  is_ruler_active: Ref<boolean>;
+  ruler_snap: Ref<boolean>;
+  ruler_point1: Ref<number[] | undefined>;
+  ruler_point2: Ref<number[] | undefined>;
+  ruler_distance: Ref<number | undefined>;
+  ruler_awaiting_point: Ref<number>;
+  handleRulerClick: (x: number, y: number) => Promise<void>;
+  applyRuler: () => Promise<void>;
+  clearRuler: () => Promise<void>;
+  deactivateRuler: () => void;
+} {
   const is_ruler_active = ref(false);
   const ruler_snap = ref(false);
   const ruler_point1 = ref<number[] | undefined>(undefined);
@@ -21,11 +30,8 @@ function useHybridViewerRuler() {
   const ruler_previous_hover_state = ref<RulerHoverState>({ active: false, fieldType: "CELL" });
 
   function updateRulerSnapHighlight(): void {
-    const hybridViewerStore = useHybridViewerStore();
-    const { is_hover_highlight, hover_highlight_field_type } = storeToRefs(
-      hybridViewerStore,
-    ) as unknown as { is_hover_highlight: Ref<boolean>; hover_highlight_field_type: Ref<string> };
-    const { clearHoverHighlight } = hybridViewerStore as unknown as HybridViewerStorePublic;
+    const { is_hover_highlight, hover_highlight_field_type, clearHoverHighlight } =
+      useHybridViewerHighlight();
 
     if (is_ruler_active.value && ruler_snap.value) {
       ruler_previous_hover_state.value = {
@@ -52,9 +58,10 @@ function useHybridViewerRuler() {
     const points = ruler_point2.value
       ? [ruler_point1.value, ruler_point2.value]
       : [ruler_point1.value];
-    const { remoteRender } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+    const { remoteRender } = useHybridViewerCore();
     const viewerStore = useViewerStore();
     const schema = viewer_schemas.opengeodeweb_viewer.viewer.ruler;
+    // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the ruler schema.
     const response = (await viewerStore.request({ schema, params: { points } })) as {
       distance?: number;
     };
@@ -63,7 +70,7 @@ function useHybridViewerRuler() {
   }
 
   async function handleRulerClick(x: number, y: number): Promise<void> {
-    const { hybridDb } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+    const { hybridDb } = useHybridViewerScene();
     const viewerStore = useViewerStore();
     let coords: number[] | undefined = undefined;
     if (ruler_snap.value) {
@@ -74,6 +81,7 @@ function useHybridViewerRuler() {
         field_type: "POINT",
         ids: Object.keys(hybridDb),
       };
+      // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the highlight schema.
       const response = (await viewerStore.request({ schema, params })) as {
         attributes?: { coordinates?: number[] };
       };
@@ -81,6 +89,7 @@ function useHybridViewerRuler() {
     } else {
       const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
       const params = { x: Math.round(x), y: Math.round(y) };
+      // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the get_point_position schema.
       const response = (await viewerStore.request({ schema, params })) as {
         x: number;
         y: number;
@@ -105,7 +114,7 @@ function useHybridViewerRuler() {
   }
 
   function deactivateRuler(): void {
-    const { clearHoverHighlight } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+    const { clearHoverHighlight } = useHybridViewerHighlight();
     is_ruler_active.value = false;
     clearHoverHighlight();
   }
@@ -116,7 +125,7 @@ function useHybridViewerRuler() {
     ruler_distance.value = undefined;
     ruler_awaiting_point.value = 1;
     deactivateRuler();
-    const { remoteRender } = useHybridViewerStore() as unknown as HybridViewerStorePublic;
+    const { remoteRender } = useHybridViewerCore();
     const viewerStore = useViewerStore();
     const schema = viewer_schemas.opengeodeweb_viewer.viewer.reset_ruler;
     await viewerStore.request({ schema });
diff --git a/internal/stores/hybrid_viewer/scene.ts b/internal/stores/hybrid_viewer/scene.ts
index 121e8d61..8f02a766 100644
--- a/internal/stores/hybrid_viewer/scene.ts
+++ b/internal/stores/hybrid_viewer/scene.ts
@@ -1,131 +1,116 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { HybridDb, vtkActor as VtkActorInstance } from "./vtk_types";
+import { requireRenderWindow, useHybridViewerCore } from "./core";
 import { ACTOR_COLOR } from "./constants";
 import { useDataStore } from "@ogw_front/stores/data";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
 import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper";
+import type vtkPolyData from "@kitware/vtk.js/Common/DataModel/PolyData";
 import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader";
-import type { HybridDb, HybridViewerStorePublic, vtkActor as VtkActorInstance } from "./vtk_types";
 
-async function performAddItem(id: string): Promise<void> {
-  const { genericRenderWindow, hybridDb } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  if (!genericRenderWindow.value) {
-    return;
-  }
-  const dataStore = useDataStore();
-  const value = await dataStore.item(id);
-  if (value && !dataStore.isItemViewable(value)) {
-    return;
-  }
-  const reader = vtkXMLPolyDataReader();
-  await reader.parseAsArrayBuffer(
-    new TextEncoder().encode(value.binary_light_viewable as string).buffer as ArrayBuffer,
-  );
-  const actor = vtkActor();
-  const mapper = vtkMapper();
-  const polydata = reader.getOutputData(0);
-  mapper.setInputData(polydata);
-  const property = actor.getProperty();
-  property.setColor(ACTOR_COLOR);
-  actor.setMapper(mapper);
-  const renderer = genericRenderWindow.value.getRenderer();
-  if (hybridDb[id] && hybridDb[id].actor) {
-    renderer.removeActor(hybridDb[id].actor);
-  }
-  const actors = renderer.getActors();
-  const isFirst = actors.length === 0;
-  renderer.addActor(actor);
-  if (isFirst) {
-    renderer.resetCamera();
-  }
-  hybridDb[id] = {
-    actor,
-    polydata,
-    mapper,
-  };
-}
-function performRemoveItem(id: string): void {
-  const { genericRenderWindow, hybridDb } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  if (!hybridDb[id]) {
-    return;
-  }
-  const renderer = genericRenderWindow.value!.getRenderer();
-  renderer.removeActor(hybridDb[id]!.actor);
-  const renderWindow = genericRenderWindow.value!.getRenderWindow();
-  renderWindow.render();
-  delete hybridDb[id];
-}
-function performSetVisibility(id: string, visibility: boolean): void {
-  const { genericRenderWindow, hybridDb } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  if (!hybridDb[id]) {
-    return;
-  }
-  hybridDb[id]!.actor.setVisibility(visibility);
-  const renderWindow = genericRenderWindow.value!.getRenderWindow();
-  renderWindow.render();
-}
-async function performSetZScaling(z_scale: number): Promise<void> {
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow, remoteRender } =
-    hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { zScale } = storeToRefs(hybridViewerStore) as unknown as { zScale: Ref<number> };
-  zScale.value = z_scale;
-  const renderer = genericRenderWindow.value!.getRenderer();
-  for (const actor of renderer.getActors() as VtkActorInstance[]) {
-    const scale = actor.getScale();
-    actor.setScale(scale[0] ?? 1, scale[1] ?? 1, z_scale);
-  }
-  renderer.resetCamera();
-  const renderWindow = genericRenderWindow.value!.getRenderWindow();
-  renderWindow.render();
-  const viewerStore = useViewerStore();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.set_z_scaling;
-  const params = {
-    z_scale,
-  };
-  await viewerStore.request({
-    schema,
-    params,
-  });
-  await remoteRender();
-}
-function performClear(): void {
-  const { genericRenderWindow, hybridDb } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
-  const renderer = genericRenderWindow.value!.getRenderer();
-  for (const actor of renderer.getActors()) {
-    renderer.removeActor(actor);
-  }
-  const renderWindow = genericRenderWindow.value!.getRenderWindow();
-  renderWindow.render();
-  for (const id of Object.keys(hybridDb)) {
-    delete hybridDb[id];
-  }
-}
-function useHybridViewerScene() {
+// Shared via createSharedComposable (rather than merged into the parent hybridViewer store) so sibling slices, e.g. camera.ts and ruler.ts, can read hybridDb/setZScaling directly without importing the parent store and creating a cycle. A Pinia store would work too but its $id/$patch/... properties would leak into the composed store's spread and collapse its inferred type.
+const useHybridViewerScene = createSharedComposable(() => {
   const hybridDb = reactive<HybridDb>({});
   const zScale = ref(1);
+
   async function addItem(id: string): Promise<void> {
-    await performAddItem(id);
+    const { genericRenderWindow } = useHybridViewerCore();
+    if (!genericRenderWindow.value) {
+      return;
+    }
+    const dataStore = useDataStore();
+    const isViewable = await dataStore.isItemViewable(id);
+    if (!isViewable) {
+      return;
+    }
+    const value = await dataStore.item(id);
+    const reader = vtkXMLPolyDataReader();
+    reader.parseAsArrayBuffer(new TextEncoder().encode(value.binary_light_viewable).buffer);
+    const actor = vtkActor();
+    const mapper = vtkMapper();
+    // oxlint-disable-next-line no-unsafe-type-assertion -- vtk.js's algorithm interface types getOutputData as `any`; this reader always produces polydata.
+    const polydata = reader.getOutputData(0) as unknown as vtkPolyData;
+    mapper.setInputData(polydata);
+    const property = actor.getProperty();
+    property.setColor(ACTOR_COLOR);
+    actor.setMapper(mapper);
+    const renderer = genericRenderWindow.value.getRenderer();
+    if (hybridDb[id]) {
+      renderer.removeActor(hybridDb[id].actor);
+    }
+    const actors = renderer.getActors();
+    const isFirst = actors.length === 0;
+    renderer.addActor(actor);
+    if (isFirst) {
+      renderer.resetCamera();
+    }
+    hybridDb[id] = {
+      actor,
+      polydata,
+      mapper,
+    };
   }
+
   function removeItem(id: string): void {
-    performRemoveItem(id);
+    const { genericRenderWindow } = useHybridViewerCore();
+    if (!hybridDb[id]) {
+      return;
+    }
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    renderer.removeActor(hybridDb[id].actor);
+    const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+    renderWindow.render();
+    Reflect.deleteProperty(hybridDb, id);
   }
+
   function setVisibility(id: string, visibility: boolean): void {
-    performSetVisibility(id, visibility);
+    const { genericRenderWindow } = useHybridViewerCore();
+    if (!hybridDb[id]) {
+      return;
+    }
+    hybridDb[id].actor.setVisibility(visibility);
+    const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+    renderWindow.render();
   }
+
   async function setZScaling(z_scale: number): Promise<void> {
-    await performSetZScaling(z_scale);
+    const { genericRenderWindow, remoteRender } = useHybridViewerCore();
+    zScale.value = z_scale;
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    // oxlint-disable-next-line no-unsafe-type-assertion -- renderer.getActors() is typed as vtkProp[] in vtk.js, but this scene only ever adds vtkActor instances.
+    for (const actor of renderer.getActors() as VtkActorInstance[]) {
+      const scale = actor.getScale();
+      actor.setScale(scale[0] ?? 1, scale[1] ?? 1, z_scale);
+    }
+    renderer.resetCamera();
+    const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+    renderWindow.render();
+    const viewerStore = useViewerStore();
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.set_z_scaling;
+    const params = {
+      z_scale,
+    };
+    await viewerStore.request({
+      schema,
+      params,
+    });
+    await remoteRender();
   }
+
   function clear(): void {
-    performClear();
+    const { genericRenderWindow } = useHybridViewerCore();
+    const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+    for (const actor of renderer.getActors()) {
+      renderer.removeActor(actor);
+    }
+    const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+    renderWindow.render();
+    for (const id of Object.keys(hybridDb)) {
+      Reflect.deleteProperty(hybridDb, id);
+    }
   }
+
   return {
     hybridDb,
     zScale,
@@ -135,12 +120,6 @@ function useHybridViewerScene() {
     setZScaling,
     clear,
   };
-}
-export {
-  performAddItem,
-  performClear,
-  performRemoveItem,
-  performSetVisibility,
-  performSetZScaling,
-  useHybridViewerScene,
-};
+});
+
+export { useHybridViewerScene };
diff --git a/internal/stores/hybrid_viewer/viewport.ts b/internal/stores/hybrid_viewer/viewport.ts
index 795597aa..e02e44a0 100644
--- a/internal/stores/hybrid_viewer/viewport.ts
+++ b/internal/stores/hybrid_viewer/viewport.ts
@@ -1,51 +1,52 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import type { Ref } from "vue";
+import type { Vector3, ViewStreamLike } from "./vtk_types";
+import { centerCameraOnPosition, useHybridViewerCamera } from "./camera";
 import { Status } from "@ogw_front/utils/status";
 import { WHEEL_TIME_OUT_MS } from "./constants";
-import { centerCameraOnPosition } from "./camera";
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useHybridViewerCore } from "./core";
+import { useHybridViewerHighlight } from "./highlight";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
-import type { HybridViewerStorePublic, Vector3 } from "./vtk_types";
 
 type ContainerRef = Ref<{ $el: HTMLElement } | undefined>;
 
-// The image stream object returned by vtk.js's ImageStream.createViewStream(); vtk.js's own vtkViewStream type declares `onImageReady` with a zero-arg callback, which doesn't match how it's actually invoked at runtime (with the decoded image), so this describes the shape as it's actually used here.
-interface ViewStreamLike {
-  setSize: (width: number, height: number) => void;
-  onImageReady: (callback: (event: { image: unknown }) => void) => void;
+interface HybridViewerViewport {
+  setContainer: (container: ContainerRef | undefined) => void;
+  resize: (width: number, height: number) => Promise<void>;
+  viewStream: Ref<ViewStreamLike | undefined>;
 }
 
 async function performResize(width: number, height: number): Promise<void> {
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow, remoteRender } =
-    hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { status, viewStream } = storeToRefs(hybridViewerStore) as unknown as {
-    status: Ref<string>;
-    viewStream: Ref<{ setSize: (width: number, height: number) => void } | undefined>;
-  };
+  const { genericRenderWindow, remoteRender, status, viewStream } = useHybridViewerCore();
   const viewerStore = useViewerStore();
   if (viewerStore.status !== Status.CONNECTED || status.value !== Status.CREATED) {
     return;
   }
-  const webGLRenderWindow = genericRenderWindow.value!.getApiSpecificRenderWindow();
-  const canvas = webGLRenderWindow.getCanvas();
+  const renderWindow = genericRenderWindow.value;
+  if (!renderWindow) {
+    return;
+  }
+  // oxlint-disable-next-line no-unsafe-assignment -- vtk.js has no types for getApiSpecificRenderWindow(); narrowed below.
+  const webGLRenderWindow = renderWindow.getApiSpecificRenderWindow();
+  // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+  const openGLRenderWindow = webGLRenderWindow as unknown as {
+    getCanvas: () => HTMLCanvasElement;
+    setSize: (width: number, height: number) => void;
+  };
+  const canvas = openGLRenderWindow.getCanvas();
   canvas.width = width;
   canvas.height = height;
   await nextTick();
-  webGLRenderWindow.setSize(width, height);
+  openGLRenderWindow.setSize(width, height);
   if (viewStream.value) {
     viewStream.value.setSize(width, height);
   }
-  const renderWindow = genericRenderWindow.value!.getRenderWindow();
-  renderWindow.render();
+  renderWindow.getRenderWindow().render();
   await remoteRender();
 }
 
 function performClickPicking(event: MouseEvent, containerElement: HTMLElement): void {
-  const { genericRenderWindow, syncRemoteCamera } =
-    useHybridViewerStore() as unknown as HybridViewerStorePublic;
+  const { genericRenderWindow } = useHybridViewerCore();
+  const { syncRemoteCamera } = useHybridViewerCamera();
   const viewerStore = useViewerStore();
   const rect = containerElement.getBoundingClientRect();
   const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
@@ -53,23 +54,24 @@ function performClickPicking(event: MouseEvent, containerElement: HTMLElement):
     x: Math.round(event.clientX - rect.left),
     y: Math.round(rect.height - (event.clientY - rect.top)),
   };
-  viewerStore.request(
+  void viewerStore.request(
     {
       schema,
       params,
     },
     {
       response_function: (response: unknown) => {
+        // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the get_point_position schema.
         const { x, y, z } = response as { x: number; y: number; z: number };
         const pickedPos: Vector3 = [x, y, z];
-        if (pickedPos.some((val) => val !== 0)) {
-          const renderer = genericRenderWindow.value!.getRenderer();
-          const camera = renderer.getActiveCamera();
-          centerCameraOnPosition(camera, pickedPos);
-          const renderWindow = genericRenderWindow.value!.getRenderWindow();
-          renderWindow.render();
-          syncRemoteCamera();
+        if (!genericRenderWindow.value || !pickedPos.some((val) => val !== 0)) {
+          return;
         }
+        const renderer = genericRenderWindow.value.getRenderer();
+        const camera = renderer.getActiveCamera();
+        centerCameraOnPosition(camera, pickedPos);
+        genericRenderWindow.value.getRenderWindow().render();
+        syncRemoteCamera();
       },
     },
   );
@@ -79,27 +81,31 @@ function performSetContainer(container: ContainerRef | undefined): void {
   if (!container || !container.value) {
     return;
   }
-  const hybridViewerStore = useHybridViewerStore();
-  const { genericRenderWindow, syncRemoteCamera, hoverHighlight } =
-    hybridViewerStore as unknown as HybridViewerStorePublic;
-  const { is_picking, is_moving } = storeToRefs(hybridViewerStore) as unknown as {
-    is_picking: Ref<boolean>;
-    is_moving: Ref<boolean>;
+  const containerElement = container.value.$el;
+  const { genericRenderWindow, is_picking, is_moving } = useHybridViewerCore();
+  const { syncRemoteCamera } = useHybridViewerCamera();
+  const { hoverHighlight } = useHybridViewerHighlight();
+  if (!genericRenderWindow.value) {
+    return;
+  }
+  genericRenderWindow.value.setContainer(containerElement);
+  // oxlint-disable-next-line no-unsafe-assignment -- vtk.js has no types for getApiSpecificRenderWindow(); narrowed below.
+  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  // oxlint-disable-next-line no-unsafe-type-assertion -- trusted vtk.js OpenGL render window API boundary.
+  const openGLRenderWindow = webGLRenderWindow as unknown as {
+    setUseBackgroundImage: (value: boolean) => void;
+    getReferenceByName: (name: string) => { style: CSSStyleDeclaration } | undefined;
   };
-  genericRenderWindow.value!.setContainer(container.value.$el);
-  const webGLRenderWindow = genericRenderWindow.value!.getApiSpecificRenderWindow();
-  webGLRenderWindow.setUseBackgroundImage(true);
-  const imageStyle = webGLRenderWindow.getReferenceByName("bgImage")?.style as
-    | CSSStyleDeclaration
-    | undefined;
+  openGLRenderWindow.setUseBackgroundImage(true);
+  const imageStyle = openGLRenderWindow.getReferenceByName("bgImage")?.style;
   Object.assign(imageStyle ?? {}, {
     transition: "opacity 0.1s ease-in",
     zIndex: 1,
   });
-  performResize(container.value.$el.offsetWidth, container.value.$el.offsetHeight);
+  void performResize(containerElement.offsetWidth, containerElement.offsetHeight);
   let has_dragged = false;
   useMousePressed({
-    target: container as never,
+    target: containerElement,
     onPressed: (event: MouseEvent | TouchEvent | DragEvent) => {
       if (!(event instanceof MouseEvent)) {
         return;
@@ -108,7 +114,7 @@ function performSetContainer(container: ContainerRef | undefined): void {
         return;
       }
       if (event.button === 0 && is_picking.value) {
-        performClickPicking(event, container.value!.$el);
+        performClickPicking(event, containerElement);
         is_picking.value = false;
         return;
       }
@@ -118,25 +124,31 @@ function performSetContainer(container: ContainerRef | undefined): void {
     },
     onReleased: () => {
       is_moving.value = false;
-      if (has_dragged) {
-        const renderer = genericRenderWindow.value!.getRenderer();
+      if (has_dragged && genericRenderWindow.value) {
+        const renderer = genericRenderWindow.value.getRenderer();
         renderer.resetCameraClippingRange();
         syncRemoteCamera();
       }
       has_dragged = false;
     },
   });
-  useEventListener(container as never, "mousemove", (event: MouseEvent) => {
+  useEventListener(containerElement, "mousemove", (event: MouseEvent) => {
     if (is_moving.value) {
       has_dragged = true;
       if (imageStyle) {
         imageStyle.opacity = "0";
       }
     }
-    hoverHighlight(event);
+    void (async (): Promise<void> => {
+      try {
+        await hoverHighlight(event);
+      } catch {
+        // Ignore hover highlight failures
+      }
+    })();
   });
   let wheelEventEndTimeout: ReturnType<typeof setTimeout> | undefined = undefined;
-  useEventListener(container as never, "wheel", () => {
+  useEventListener(containerElement, "wheel", () => {
     is_moving.value = true;
     if (imageStyle) {
       imageStyle.opacity = "0";
@@ -144,14 +156,17 @@ function performSetContainer(container: ContainerRef | undefined): void {
     clearTimeout(wheelEventEndTimeout);
     wheelEventEndTimeout = setTimeout(() => {
       is_moving.value = false;
-      const renderer = genericRenderWindow.value!.getRenderer();
+      if (!genericRenderWindow.value) {
+        return;
+      }
+      const renderer = genericRenderWindow.value.getRenderer();
       renderer.resetCameraClippingRange();
       syncRemoteCamera();
     }, WHEEL_TIME_OUT_MS);
   });
 }
-function useHybridViewerViewport() {
-  const viewStream = ref<ViewStreamLike | undefined>(undefined);
+function useHybridViewerViewport(): HybridViewerViewport {
+  const { viewStream } = useHybridViewerCore();
   function setContainer(container: ContainerRef | undefined): void {
     performSetContainer(container);
   }
@@ -165,4 +180,4 @@ function useHybridViewerViewport() {
   };
 }
 export { performClickPicking, performResize, performSetContainer, useHybridViewerViewport };
-export type { ViewStreamLike };
+export type { ViewStreamLike } from "./vtk_types";
diff --git a/internal/stores/hybrid_viewer/vtk_types.ts b/internal/stores/hybrid_viewer/vtk_types.ts
index 44047c93..c5739dd0 100644
--- a/internal/stores/hybrid_viewer/vtk_types.ts
+++ b/internal/stores/hybrid_viewer/vtk_types.ts
@@ -1,14 +1,5 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// This file's imported vtk.js types are also used locally (CameraOptions, HybridDbEntry, HybridViewerStorePublic reference them directly), not just re-exported, so they can't become pure `export ... from "...";` re-exports without losing the local binding these interfaces need.
-// oxlint-disable eslint/sort-imports, unicorn/prefer-export-from
-// Re-exports of vtk.js's own (real, shipped) TypeScript types for the objects the hybrid viewer store composables interact with, plus the handful of shapes that are specific to this codebase (CameraOptions' snake_case wire format, the local hybridDb map, hover highlight data, ...).
-import type { vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
-import type { vtkRenderer } from "@kitware/vtk.js/Rendering/Core/Renderer";
-import type { vtkRenderWindow } from "@kitware/vtk.js/Rendering/Core/RenderWindow";
-import type { vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
-import type { vtkOpenGLRenderWindow } from "@kitware/vtk.js/Rendering/OpenGL/RenderWindow";
-import type vtkActor from "@kitware/vtk.js/Rendering/Core/Actor";
 import type { Vector3 } from "@kitware/vtk.js/types";
+import type vtkActor from "@kitware/vtk.js/Rendering/Core/Actor";
 
 // The camera state as exchanged with the viewer microservice (snake_case field names, plain arrays) - distinct from vtk.js's own vtkCamera object.
 interface CameraOptions {
@@ -44,31 +35,24 @@ interface HoverData {
   attributes: Record<string, unknown>;
 }
 
-// The parent Pinia store (app/stores/hybrid_viewer.ts) assembles these composables via `...spread` and is converted/typed separately from this directory, so its exact inferred return type isn't reliable to build on here. This describes just the slice of its returned (already-unwrapped) state and actions that the composables in this folder read or call directly (i.e. not through `storeToRefs`, which callers type separately at each destructuring site).
-interface HybridViewerStorePublic {
-  genericRenderWindow: { value: vtkGenericRenderWindow | undefined };
-  hybridDb: HybridDb;
-  camera_options: Record<string, unknown>;
-  remoteRender: () => Promise<void> | void;
-  clearHoverHighlight: () => void;
-  syncRemoteCamera: () => void;
-  hoverHighlight: (event: MouseEvent) => void;
-  setZScaling: (value: number) => Promise<void>;
-  setCamera: (options: CameraOptions) => void;
+// The image stream object returned by vtk.js's ImageStream.createViewStream(); vtk.js's own vtkViewStream type declares `onImageReady` with a zero-arg callback, which doesn't match how it's actually invoked at runtime (with the decoded image), so this describes the shape as it's actually used here.
+interface ViewStreamLike {
+  setSize: (width: number, height: number) => void;
+  onImageReady: (callback: (event: { image: unknown }) => void) => void;
 }
 
+export type { Vector3 } from "@kitware/vtk.js/types";
+export type { default as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
+export type { vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
+export type { vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
+export type { vtkOpenGLRenderWindow } from "@kitware/vtk.js/Rendering/OpenGL/RenderWindow";
+export type { vtkRenderWindow } from "@kitware/vtk.js/Rendering/Core/RenderWindow";
+export type { vtkRenderer } from "@kitware/vtk.js/Rendering/Core/Renderer";
 export type {
-  vtkCamera,
-  vtkRenderer,
-  vtkRenderWindow,
-  vtkGenericRenderWindow,
-  vtkOpenGLRenderWindow,
-  vtkActor,
-  Vector3,
   CameraOptions,
   HybridDbEntry,
   HybridDb,
   HoverComponentInfo,
   HoverData,
-  HybridViewerStorePublic,
+  ViewStreamLike,
 };
diff --git a/internal/utils/api_fetch.ts b/internal/utils/api_fetch.ts
index 5d1b35db..a48b9edf 100644
--- a/internal/utils/api_fetch.ts
+++ b/internal/utils/api_fetch.ts
@@ -1,9 +1,7 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { JsonRpcSchema, RequestHandlersWithValidation } from "@ogw_shared/utils/types.js";
 import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
 import { fetchSchema } from "@ogw_shared/utils/fetch_schema";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
-import type { JsonRpcSchema, RequestHandlersWithValidation } from "@ogw_shared/utils/types.js";
 
 // The microservice-backed Pinia stores (back/app/...) all expose this shape; only the slice actually used here needs to be declared.
 interface Microservice {
@@ -33,7 +31,33 @@ interface FetchErrorResponseLike {
   description?: string;
 }
 
-function api_fetch(
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function toFetchErrorLike(error: unknown): FetchErrorLike {
+  if (!isRecord(error)) {
+    return {};
+  }
+  return {
+    code: typeof error.code === "number" ? error.code : undefined,
+    message: typeof error.message === "string" ? error.message : undefined,
+    stack: typeof error.stack === "string" ? error.stack : undefined,
+  };
+}
+
+function toFetchErrorResponseLike(response: unknown): FetchErrorResponseLike {
+  if (!isRecord(response)) {
+    return {};
+  }
+  return {
+    status: typeof response.status === "number" ? response.status : undefined,
+    name: typeof response.name === "string" ? response.name : undefined,
+    description: typeof response.description === "string" ? response.description : undefined,
+  };
+}
+
+async function api_fetch(
   microservice: Microservice,
   { schema, params = {}, headers = {} }: ApiFetchParams,
   {
@@ -42,13 +66,13 @@ function api_fetch(
     response_error_function,
     timeout,
   }: RequestHandlersWithValidation & { timeout?: number } = {},
-) {
+): Promise<unknown> {
   console.log("[API] Fetching", microservice.base_url);
   const feedbackStore = useFeedbackStore();
   microservice.start_request();
 
   const requestStartingTime = startRequestLog(microservice, schema);
-  return fetchSchema(
+  const result = await fetchSchema(
     {
       schema,
       params,
@@ -59,7 +83,7 @@ function api_fetch(
     {
       request_error_function(error: unknown) {
         microservice.stop_request();
-        const typedError = error as FetchErrorLike;
+        const typedError = toFetchErrorLike(error);
         feedbackStore.add_error(
           typedError.code ?? 0,
           schema.$id,
@@ -79,7 +103,7 @@ function api_fetch(
       },
       response_error_function(response: unknown) {
         microservice.stop_request();
-        const typedResponse = response as FetchErrorResponseLike;
+        const typedResponse = toFetchErrorResponseLike(response);
         feedbackStore.add_error(
           typedResponse.status ?? 0,
           schema.$id,
@@ -96,6 +120,7 @@ function api_fetch(
       },
     },
   );
+  return result;
 }
 
 export { api_fetch };
diff --git a/internal/utils/upload_file.ts b/internal/utils/upload_file.ts
index 81a30017..8b4c9444 100644
--- a/internal/utils/upload_file.ts
+++ b/internal/utils/upload_file.ts
@@ -1,9 +1,7 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-import { fetchRaw } from "@ogw_shared/utils/fetch_raw.js";
-import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
 import type { JsonRpcSchema, RequestHandlers } from "@ogw_shared/utils/types.js";
 import type { Microservice } from "./api_fetch.js";
+import { fetchRaw } from "@ogw_shared/utils/fetch_raw.js";
+import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
 
 interface UploadFileParams {
   // Always forwarded to fetchRaw via schema.methods, which is only ever set on
@@ -26,16 +24,24 @@ interface FetchErrorResponseLike {
   description?: string;
 }
 
-function upload_file(
+function isFetchErrorLike(value: unknown): value is FetchErrorLike {
+  return typeof value === "object" && value !== null;
+}
+
+function isFetchErrorResponseLike(value: unknown): value is FetchErrorResponseLike {
+  return typeof value === "object" && value !== null;
+}
+
+async function upload_file(
   microservice: Microservice,
   { schema, file, params = {} }: UploadFileParams,
   { request_error_function, response_function, response_error_function }: RequestHandlers = {},
-) {
+): Promise<unknown> {
   console.log("[UPLOAD_FILE] Uploading file", { schema, file });
   const feedbackStore = useFeedbackStore();
 
   if (!(file instanceof File)) {
-    return Promise.reject(new Error("file must be an instance of File"));
+    throw new Error("file must be an instance of File");
   }
 
   const body = new FormData();
@@ -47,7 +53,7 @@ function upload_file(
   microservice.start_request();
   const route = schema.$id;
 
-  return fetchRaw(
+  const result = await fetchRaw(
     {
       route,
       method: schema.methods.find((method) => method !== "OPTIONS"),
@@ -57,7 +63,7 @@ function upload_file(
     {
       request_error_function(error: unknown) {
         microservice.stop_request();
-        const typedError = error as FetchErrorLike;
+        const typedError = isFetchErrorLike(error) ? error : {};
         feedbackStore.add_error(
           typedError.code ?? 0,
           route,
@@ -76,7 +82,7 @@ function upload_file(
       },
       response_error_function(response: unknown) {
         microservice.stop_request();
-        const typedResponse = response as FetchErrorResponseLike;
+        const typedResponse = isFetchErrorResponseLike(response) ? response : {};
         feedbackStore.add_error(
           typedResponse.status ?? 0,
           route,
@@ -89,6 +95,7 @@ function upload_file(
       },
     },
   );
+  return result;
 }
 
 export { upload_file };
diff --git a/internal/utils/viewer_call.ts b/internal/utils/viewer_call.ts
index f31e34a2..bf332cec 100644
--- a/internal/utils/viewer_call.ts
+++ b/internal/utils/viewer_call.ts
@@ -1,11 +1,9 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { JsonRpcSchema, RequestHandlersWithValidation } from "@ogw_shared/utils/types.js";
 import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
+import type { Microservice } from "./api_fetch.js";
+import type { RpcClient } from "@ogw_shared/utils/call_raw.js";
 import { callSchema } from "@ogw_shared/utils/call_schema";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
-import type { JsonRpcSchema, RequestHandlersWithValidation } from "@ogw_shared/utils/types.js";
-import type { RpcClient } from "@ogw_shared/utils/call_raw.js";
-import type { Microservice } from "./api_fetch.js";
 
 interface ViewerMicroservice extends Microservice {
   client: RpcClient;
@@ -23,7 +21,17 @@ interface RpcErrorLike {
   message?: string;
 }
 
-function viewer_call(
+function toRpcErrorLike(value: unknown): RpcErrorLike {
+  if (typeof value !== "object" || value === null) {
+    return {};
+  }
+  return {
+    code: "code" in value && typeof value.code === "number" ? value.code : undefined,
+    message: "message" in value && typeof value.message === "string" ? value.message : undefined,
+  };
+}
+
+async function viewer_call(
   microservice: ViewerMicroservice,
   { schema, params = {}, timeout }: ViewerCallParams,
   {
@@ -31,12 +39,12 @@ function viewer_call(
     response_function,
     response_error_function,
   }: RequestHandlersWithValidation = {},
-) {
+): Promise<unknown> {
   const feedbackStore = useFeedbackStore();
   const { client } = microservice;
 
   const requestStartingTime = startRequestLog(microservice, schema);
-  return callSchema(
+  const result = await callSchema(
     {
       schema,
       params,
@@ -46,7 +54,7 @@ function viewer_call(
     {
       request_error_function(error: unknown) {
         microservice.stop_request();
-        const typedError = error as RpcErrorLike;
+        const typedError = toRpcErrorLike(error);
         feedbackStore.add_error(
           typedError.code ?? 0,
           schema.$id,
@@ -66,8 +74,7 @@ function viewer_call(
       },
       response_error_function(response: unknown) {
         microservice.stop_request();
-        // Pre-existing bug: this used an undefined `error` identifier (ReferenceError at runtime); fixed to use `response`, mirroring request_error_function above.
-        const typedResponse = response as RpcErrorLike;
+        const typedResponse = toRpcErrorLike(response);
         feedbackStore.add_error(
           typedResponse.code ?? 0,
           schema.$id,
@@ -84,6 +91,7 @@ function viewer_call(
       },
     },
   );
+  return result;
 }
 
 export { viewer_call };
diff --git a/internal/utils/ws_client.ts b/internal/utils/ws_client.ts
index b8f16d07..0136c4df 100644
--- a/internal/utils/ws_client.ts
+++ b/internal/utils/ws_client.ts
@@ -1,32 +1,43 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 // Third party imports
-import vtkWSLinkClient, { newInstance } from "@kitware/vtk.js/IO/Core/WSLinkClient";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { vtkWSLinkClient as VtkWSLinkClient } from "@kitware/vtk.js/IO/Core/WSLinkClient";
+import vtkWSLinkClient, {
+  type vtkWSLinkClient as VtkWSLinkClient,
+  newInstance,
+} from "@kitware/vtk.js/IO/Core/WSLinkClient";
 import SmartConnect from "wslink/src/SmartConnect";
-import _ from "lodash";
 
 interface WsClientCallbacks {
   onConnectionClose?: () => void;
 }
 
+// Wslink's connection event shape is untyped upstream; this describes the fields we read.
+interface WsConnectionEvent {
+  response?: { error?: string };
+}
+
+function isVtkWSLinkClient(value: unknown): value is VtkWSLinkClient {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "connect" in value &&
+    "onConnectionError" in value &&
+    "onConnectionClose" in value
+  );
+}
+
 async function initWebSocketClient(
   baseUrl: string,
   initialClient: unknown = {},
   { onConnectionClose }: WsClientCallbacks = {},
 ): Promise<VtkWSLinkClient> {
   vtkWSLinkClient.setSmartConnectClass(SmartConnect);
-  const client = (_.isEmpty(initialClient) ? newInstance() : initialClient) as VtkWSLinkClient;
+  const client = isVtkWSLinkClient(initialClient) ? initialClient : newInstance();
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- wslink's httpReq shape is untyped upstream.
-  client.onConnectionError((httpReq: any) => {
-    const message = httpReq?.response?.error || `Connection error`;
+  client.onConnectionError((httpReq: WsConnectionEvent) => {
+    const message = httpReq.response?.error ?? "Connection error";
     console.error(message);
   });
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- wslink's httpReq shape is untyped upstream.
-  client.onConnectionClose((httpReq: any) => {
-    const message = httpReq?.response?.error || `Connection close`;
+  client.onConnectionClose((httpReq: WsConnectionEvent) => {
+    const message = httpReq.response?.error ?? "Connection close";
     onConnectionClose?.();
     console.error(message);
   });
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 52f5dcbb..03eee6d9 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,4 +1,5 @@
 // Node imports
+import fs from "node:fs";
 import path from "node:path";
 
 // Third party imports
@@ -9,6 +10,28 @@ import package_json from "./package.json";
 
 const __dirname = import.meta.dirname;
 
+// Oxlint's type-aware linter auto-discovers each file's nearest tsconfig.json
+// By walking up directories, and any "extends" on that discovered file makes
+// Its whole type-aware resolution collapse: every symbol coming through the
+// Aliases normally only defined in .nuxt/tsconfig.json (@ogw_shared, etc.,
+// But also Nuxt's own #app/#imports/defineStore auto-imports) becomes an
+// `error` type, even though tsc/vue-tsc resolve the exact same "extends"
+// Chain correctly (oxc-project/oxc#22345). The only fix is for the root
+// Tsconfig.json to be fully self-contained: no "extends", with its own copy
+// Of .nuxt/tsconfig.json's compilerOptions.paths (re-relativized here, since
+// They're written relative to .nuxt/) and a deliberately project-wide
+// "include" (unlike .nuxt/tsconfig.json's own include, which only covers
+// Nuxt's conventional folders and would otherwise silently drop internal/,
+// Tests/, etc. from the program). Regenerated on every Nuxt prepare so it
+// Can never drift from what Nuxt actually resolves.
+function remap_path_to_root(target: string, build_dir: string): string {
+  const relative = path
+    .relative(__dirname, path.resolve(build_dir, target))
+    .split(path.sep)
+    .join("/");
+  return relative.startsWith("./") || relative.startsWith("../") ? relative : `./${relative}`;
+}
+
 // Nuxt requires this file's config object as the default export; the shared org lint config's no-default-export override only lists *.config.js, not *.config.ts, since this file predates the TypeScript migration.
 // oxlint-disable-next-line import/no-default-export
 export default defineNuxtConfig({
@@ -17,7 +40,7 @@ export default defineNuxtConfig({
       COMMAND_BACK: "opengeodeweb-back",
       COMMAND_VIEWER: "opengeodeweb-viewer",
       NUXT_ROOT_PATH: __dirname,
-      MODE: process.env.MODE || "CLOUD",
+      MODE: process.env.MODE ?? "CLOUD",
       PROJECT: package_json.name,
     },
   },
@@ -108,4 +131,38 @@ export default defineNuxtConfig({
       ],
     },
   },
+  typescript: {
+    tsConfig: {
+      compilerOptions: {
+        types: ["node", "ws", "busboy"],
+      },
+    },
+  },
+
+  hooks: {
+    "prepare:types": ({ tsConfig }) => {
+      const paths = tsConfig.compilerOptions?.paths;
+      if (!paths) {
+        return;
+      }
+      const build_dir = path.resolve(__dirname, ".nuxt");
+      const root_paths = Object.fromEntries(
+        Object.entries(paths).map(([alias, targets]) => [
+          alias,
+          targets.map((target) => remap_path_to_root(target, build_dir)),
+        ]),
+      );
+      fs.writeFileSync(
+        path.resolve(__dirname, "tsconfig.json"),
+        `${JSON.stringify(
+          {
+            compilerOptions: { ...tsConfig.compilerOptions, paths: root_paths },
+            include: ["**/*", "./.nuxt/nuxt.d.ts"],
+          },
+          undefined,
+          2,
+        )}\n`,
+      );
+    },
+  },
 });
diff --git a/package.json b/package.json
index b9f20bf3..621f2ffd 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "internal",
     "server",
     "shared",
+    ".build",
     "nuxt.config.ts",
     "opengeodeweb_front_schemas.json",
     "opengeodeweb_front_schemas.js",
@@ -32,6 +33,14 @@
   "main": "./nuxt.config.ts",
   "exports": {
     ".": "./nuxt.config.ts",
+    "./server/utils/*.js": {
+      "types": "./server/utils/*.ts",
+      "default": "./.build/server/utils/*.js"
+    },
+    "./shared/*.js": {
+      "types": "./shared/*.ts",
+      "default": "./.build/shared/*.js"
+    },
     "./*": "./*"
   },
   "publishConfig": {
@@ -55,11 +64,10 @@
   "dependencies": {
     "@geode/opengeodeweb-back": "0.0.0",
     "@geode/opengeodeweb-viewer": "0.0.0",
-    "@google-cloud/run": "3.2.0",
+    "@google-cloud/run": "4.1.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "1.0.1",
-    "@types/node": "22.15.3",
     "@vueuse/components": "13.1.0",
     "@vueuse/core": "13.1.0",
     "@vueuse/nuxt": "13.1.0",
@@ -69,8 +77,8 @@
     "conf": "15.1.0",
     "dexie": "4.2.1",
     "get-port-please": "3.2.0",
-    "google-auth-library": "10.6.1",
-    "googleapis": "171.4.0",
+    "google-auth-library": "11.0.2",
+    "googleapis": "181.0.0",
     "js-file-download": "0.4.12",
     "jszip": "3.10.1",
     "lodash": "4.18.1",
@@ -89,12 +97,16 @@
     "vuetify": "4.2.0",
     "vuetify-nuxt-module": "1.0.0-rc.5",
     "ws": "8.21.2",
-    "wslink": "1.12.4"
+    "wslink": "1.12.4",
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@nuxt/test-utils": "4.1.0",
     "@pinia/testing": "2.0.1",
+    "@types/busboy": "1.5.4",
     "@types/lodash": "4.17.25",
+    "@types/node": "22.20.3",
+    "@types/ws": "8.18.1",
     "@vitejs/plugin-vue": "6.0.8",
     "@vue/test-utils": "2.4.11",
     "happy-dom": "20.0.11",
diff --git a/rolldown.config.ts b/rolldown.config.ts
index 8230ffdf..756815a8 100644
--- a/rolldown.config.ts
+++ b/rolldown.config.ts
@@ -3,6 +3,8 @@ import path from "node:path";
 
 import { defineConfig } from "rolldown";
 
+import package_json from "./package.json" with { type: "json" };
+
 // Server/utils/extension.ts relies on Nitro's "#imports" auto-import alias and cannot run outside a Nitro server, so it is excluded from this build.
 const EXCLUDED_FILES = new Set(["server/utils/extension.ts"]);
 
@@ -20,7 +22,7 @@ function collectTsFiles(dir: string): string[] {
   return files;
 }
 
-const ownPackageName = JSON.parse(fs.readFileSync("package.json", "utf8")).name as string;
+const ownPackageName = package_json.name;
 
 function isExternal(id: string): boolean {
   if (id.startsWith(".") || path.isAbsolute(id)) {
@@ -38,7 +40,7 @@ export default defineConfig({
   platform: "node",
   external: isExternal,
   output: {
-    dir: ".",
+    dir: ".build",
     format: "esm",
     preserveModules: true,
     preserveModulesRoot: ".",
diff --git a/server/api/cloud/extensions/run.post.ts b/server/api/cloud/extensions/run.post.ts
index b797aaa0..168aad70 100644
--- a/server/api/cloud/extensions/run.post.ts
+++ b/server/api/cloud/extensions/run.post.ts
@@ -2,7 +2,7 @@
 import fs from "node:fs";
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -25,15 +25,13 @@ interface RunExtensionsBody {
   projectName: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     console.log("NITRO: runExtensions", event);
     const { projectFolderPath, projectName } = await readBody<RunExtensionsBody>(event);
     const extensionsConfig = extensionsConf(projectName);
     const extensionsArray = await Promise.all(
-      Object.keys(extensionsConfig).map(async (extensionId) => {
-        // Safe: extensionId comes from Object.keys(extensionsConfig) itself.
-        const extensionPath = extensionsConfig[extensionId]!.path;
+      Object.entries(extensionsConfig).map(async ([extensionId, { path: extensionPath }]) => {
         const unzippedExtensionPath = await unzipFile(
           extensionPath,
           extensionFolderPath(projectFolderPath, extensionId),
@@ -49,12 +47,10 @@ export default defineEventHandler(async (event) => {
         const port = await runExtension(id, backendExecutable, unzippedExtensionPath, {
           projectFolderPath,
         });
-        await addMicroserviceMetadatas(projectFolderPath, {
+        addMicroserviceMetadatas(projectFolderPath, {
           type: "back",
           name,
-          // RunExtension can exhaust its port-conflict retries and return undefined
-          // (pre-existing bug: addMicroserviceMetadatas/URLs then embed "undefined").
-          port: port as number,
+          port,
         });
         return {
           id,
@@ -74,7 +70,7 @@ export default defineEventHandler(async (event) => {
     console.error("Error running extensions:", error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/app/project_folder_path.post.ts b/server/api/local/app/project_folder_path.post.ts
index ac7d7a83..c4464fa2 100644
--- a/server/api/local/app/project_folder_path.post.ts
+++ b/server/api/local/app/project_folder_path.post.ts
@@ -1,7 +1,7 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -13,11 +13,11 @@ interface ProjectFolderPathBody {
   PROJECT: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { PROJECT } = await readBody<ProjectFolderPathBody>(event);
     const projectFolderPath = generateProjectFolderPath(PROJECT);
-    await createPath(projectFolderPath);
+    createPath(projectFolderPath);
 
     return {
       statusCode: 200,
@@ -27,7 +27,7 @@ export default defineEventHandler(async (event) => {
     console.log(error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/app/run_back.post.ts b/server/api/local/app/run_back.post.ts
index f1779eda..413040b9 100644
--- a/server/api/local/app/run_back.post.ts
+++ b/server/api/local/app/run_back.post.ts
@@ -1,7 +1,7 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -15,16 +15,14 @@ interface RunBackBody {
   args: { projectFolderPath: string; [key: string]: unknown };
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { COMMAND_BACK, NUXT_ROOT_PATH, args } = await readBody<RunBackBody>(event);
     const port = await runBack(COMMAND_BACK, NUXT_ROOT_PATH, args);
-    await addMicroserviceMetadatas(args.projectFolderPath, {
+    addMicroserviceMetadatas(args.projectFolderPath, {
       type: "back",
       name: COMMAND_BACK,
-      // RunBack can exhaust its port-conflict retries and return undefined
-      // (pre-existing bug: addMicroserviceMetadatas/URLs then embed "undefined").
-      port: port as number,
+      port,
     });
 
     return {
@@ -35,7 +33,7 @@ export default defineEventHandler(async (event) => {
     console.log(error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/app/run_viewer.post.ts b/server/api/local/app/run_viewer.post.ts
index 1732723a..4f622dba 100644
--- a/server/api/local/app/run_viewer.post.ts
+++ b/server/api/local/app/run_viewer.post.ts
@@ -1,7 +1,7 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -15,16 +15,14 @@ interface RunViewerBody {
   args: { projectFolderPath: string; [key: string]: unknown };
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { COMMAND_VIEWER, NUXT_ROOT_PATH, args } = await readBody<RunViewerBody>(event);
     const port = await runViewer(COMMAND_VIEWER, NUXT_ROOT_PATH, args);
-    await addMicroserviceMetadatas(args.projectFolderPath, {
+    addMicroserviceMetadatas(args.projectFolderPath, {
       type: "viewer",
       name: COMMAND_VIEWER,
-      // RunViewer can exhaust its port-conflict retries and return undefined
-      // (pre-existing bug: addMicroserviceMetadatas/URLs then embed "undefined").
-      port: port as number,
+      port,
     });
 
     return {
@@ -35,7 +33,7 @@ export default defineEventHandler(async (event) => {
     console.log(error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/extensions/kill.post.ts b/server/api/local/extensions/kill.post.ts
index ffa8af6a..caf248ea 100644
--- a/server/api/local/extensions/kill.post.ts
+++ b/server/api/local/extensions/kill.post.ts
@@ -1,7 +1,7 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -19,7 +19,7 @@ interface KillExtensionBody {
   extensionId: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const body = await readBody<KillExtensionBody>(event);
     const { projectFolderPath, projectName, extensionId } = body;
@@ -43,7 +43,8 @@ export default defineEventHandler(async (event) => {
     console.error("Error killing extension:", error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/extensions/run.post.ts b/server/api/local/extensions/run.post.ts
index 4f4247f5..d940aa8d 100644
--- a/server/api/local/extensions/run.post.ts
+++ b/server/api/local/extensions/run.post.ts
@@ -2,7 +2,7 @@
 import fs from "node:fs";
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -25,15 +25,13 @@ interface RunExtensionsBody {
   projectName: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     console.log("NITRO: runExtensions", event);
     const { projectFolderPath, projectName } = await readBody<RunExtensionsBody>(event);
     const extensionsConfig = extensionsConf(projectName);
     const extensionsArray = await Promise.all(
-      Object.keys(extensionsConfig).map(async (extensionId) => {
-        // Safe: extensionId comes from Object.keys(extensionsConfig) itself.
-        const extensionPath = extensionsConfig[extensionId]!.path;
+      Object.entries(extensionsConfig).map(async ([extensionId, { path: extensionPath }]) => {
         const unzippedExtensionPath = await unzipFile(
           extensionPath,
           extensionFolderPath(projectFolderPath, extensionId),
@@ -49,12 +47,10 @@ export default defineEventHandler(async (event) => {
         const port = await runBack(backendExecutable, unzippedExtensionPath, {
           projectFolderPath,
         });
-        await addMicroserviceMetadatas(projectFolderPath, {
+        addMicroserviceMetadatas(projectFolderPath, {
           type: "back",
           name,
-          // RunBack can exhaust its port-conflict retries and return undefined
-          // (pre-existing bug: addMicroserviceMetadatas/URLs then embed "undefined").
-          port: port as number,
+          port,
         });
         return {
           id,
@@ -74,7 +70,8 @@ export default defineEventHandler(async (event) => {
     console.error("Error running extensions:", error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/local/extensions/upload.put.ts b/server/api/local/extensions/upload.put.ts
index 8ae0b0ea..474e0682 100644
--- a/server/api/local/extensions/upload.put.ts
+++ b/server/api/local/extensions/upload.put.ts
@@ -1,14 +1,17 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-/// <reference path="../../../types/vendor.d.ts" />
 // Node imports
 import { finished, pipeline } from "node:stream/promises";
+import type { IncomingHttpHeaders } from "node:http";
 import { Readable } from "node:stream";
-import type { ReadableStream as NodeReadableStream } from "node:stream/web";
 import fs from "node:fs";
 
 // Third party imports
-import { createError, defineEventHandler, getRequestHeaders, getRequestWebStream } from "h3";
+import {
+  type H3Event,
+  createError,
+  defineEventHandler,
+  getRequestHeaders,
+  getRequestWebStream,
+} from "h3";
 import busboy from "busboy";
 
 // Local imports
@@ -16,18 +19,24 @@ import {
   registerExtensionFile,
   targetExtensionFilePath,
 } from "@geode/opengeodeweb-front/server/utils/app_config.ts";
+import { toNodeWebStream } from "@geode/opengeodeweb-front/server/utils/stream.ts";
 
 const CODE_201 = 201;
 const BYTES_PER_KIBIBYTE = 1024;
 const MAX_FILE_MEGABYTES = 500;
 const FILE_SIZE_LIMIT = MAX_FILE_MEGABYTES * BYTES_PER_KIBIBYTE * BYTES_PER_KIBIBYTE;
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   const writePromises: Promise<void>[] = [];
   const savedFiles: string[] = [];
 
+  const headers: IncomingHttpHeaders = Object.fromEntries(
+    Object.entries(getRequestHeaders(event)).filter(
+      (entry: readonly [string, string | undefined]) => entry[1] !== undefined,
+    ),
+  );
   const busboyInstance = busboy({
-    headers: getRequestHeaders(event),
+    headers,
     limits: {
       fileSize: FILE_SIZE_LIMIT,
       files: 1,
@@ -48,26 +57,30 @@ export default defineEventHandler(async (event) => {
       return;
     }
     const targetPath = targetExtensionFilePath(projectName, info.filename);
-    const writePromise = (async () => {
+    const writePromise = (async (): Promise<void> => {
       const writeStream = fs.createWriteStream(targetPath);
       await pipeline(fileStream, writeStream);
       savedFiles.push(targetPath);
       console.log("File written:", targetPath);
     })();
     writePromises.push(writePromise);
-    fileStream.on("limit", () => busboyInstance.destroy(new Error("File too large")));
+    fileStream.on("limit", () => {
+      busboyInstance.destroy(new Error("File too large"));
+    });
   });
 
-  busboyInstance.on("filesLimit", () => busboyInstance.destroy(new Error("Too many files")));
-  busboyInstance.on("partsLimit", () => busboyInstance.destroy(new Error("Too many parts")));
+  busboyInstance.on("filesLimit", () => {
+    busboyInstance.destroy(new Error("Too many files"));
+  });
+  busboyInstance.on("partsLimit", () => {
+    busboyInstance.destroy(new Error("Too many parts"));
+  });
 
   const webStream = getRequestWebStream(event);
   if (!webStream) {
     throw createError({ statusCode: 400, message: "No request body received" });
   }
-  // H3's ReadableStream (lib.dom) and Node's stream/web ReadableStream are structurally
-  // The same at runtime but the two ambient type declarations aren't nominally compatible.
-  Readable.fromWeb(webStream as unknown as NodeReadableStream).pipe(busboyInstance);
+  Readable.fromWeb(toNodeWebStream(webStream)).pipe(busboyInstance);
   await finished(busboyInstance);
   if (writePromises.length > 0) {
     await Promise.all(writePromises);
@@ -76,6 +89,10 @@ export default defineEventHandler(async (event) => {
   if (savedFiles.length === 0) {
     throw createError({ statusCode: 400, message: "No file received" });
   }
-  await Promise.all(savedFiles.map(async (file) => await registerExtensionFile(projectName, file)));
+  await Promise.all(
+    savedFiles.map(async (file) => {
+      await registerExtensionFile(projectName, file);
+    }),
+  );
   return { statusCode: CODE_201 };
 });
diff --git a/server/api/microservice/app/get_is_app_ready.get.ts b/server/api/microservice/app/get_is_app_ready.get.ts
index 9a4aa8ec..d832a8aa 100644
--- a/server/api/microservice/app/get_is_app_ready.get.ts
+++ b/server/api/microservice/app/get_is_app_ready.get.ts
@@ -4,17 +4,16 @@ import { createError, defineEventHandler } from "h3";
 // Local imports
 import { getIsAppReady } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
 
-export default defineEventHandler(async () => {
+export default defineEventHandler(() => {
   try {
-    const isReady = await getIsAppReady();
+    const isReady = getIsAppReady();
     console.log(`IS_APP_READY is ${isReady}`);
     return { statusCode: 200, isReady };
   } catch (error) {
     console.log(error);
-    const err = error as { statusCode?: number; statusMessage?: string; message?: string };
     throw createError({
-      statusCode: err.statusCode,
-      statusMessage: err.statusMessage ?? err.message,
+      statusCode: 500,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/microservice/app/set_app_base_url.post.ts b/server/api/microservice/app/set_app_base_url.post.ts
index 0fcaf6ab..4f32b33f 100644
--- a/server/api/microservice/app/set_app_base_url.post.ts
+++ b/server/api/microservice/app/set_app_base_url.post.ts
@@ -1,5 +1,5 @@
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import { setAppBaseUrl } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
@@ -8,23 +8,22 @@ interface SetAppBaseUrlBody {
   baseUrl: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { baseUrl } = await readBody<SetAppBaseUrlBody>(event);
     if (!baseUrl) {
       throw createError({ statusCode: 400, statusMessage: "baseUrl is required" });
     }
 
-    await setAppBaseUrl(baseUrl);
+    setAppBaseUrl(baseUrl);
     console.log(`Updated APP_BASE_URL to ${baseUrl}`);
 
     return { statusCode: 200, baseUrl };
   } catch (error) {
     console.log(error);
-    const err = error as { statusCode?: number; statusMessage?: string; message?: string };
     throw createError({
-      statusCode: err.statusCode,
-      statusMessage: err.statusMessage ?? err.message,
+      statusCode: 500,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/microservice/app/set_back_base_url.post.ts b/server/api/microservice/app/set_back_base_url.post.ts
index 85197161..6af5234b 100644
--- a/server/api/microservice/app/set_back_base_url.post.ts
+++ b/server/api/microservice/app/set_back_base_url.post.ts
@@ -1,5 +1,5 @@
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import { setBackBaseUrl } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
@@ -8,20 +8,19 @@ interface SetBackBaseUrlBody {
   baseUrl: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { baseUrl } = await readBody<SetBackBaseUrlBody>(event);
     if (!baseUrl) {
       throw createError({ statusCode: 400, statusMessage: "baseUrl is required" });
     }
-    await setBackBaseUrl(baseUrl);
+    setBackBaseUrl(baseUrl);
     return { statusCode: 200, baseUrl };
   } catch (error) {
     console.log(error);
-    const err = error as { statusCode?: number; message?: string };
     throw createError({
-      statusCode: err.statusCode,
-      statusMessage: err.message,
+      statusCode: 500,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/microservice/app/set_is_app_ready.post.ts b/server/api/microservice/app/set_is_app_ready.post.ts
index cd91499d..7163e43a 100644
--- a/server/api/microservice/app/set_is_app_ready.post.ts
+++ b/server/api/microservice/app/set_is_app_ready.post.ts
@@ -1,5 +1,5 @@
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import { setIsAppReady } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
@@ -8,23 +8,22 @@ interface SetIsAppReadyBody {
   isReady: boolean;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { isReady } = await readBody<SetIsAppReadyBody>(event);
     if (!isReady) {
       throw createError({ statusCode: 400, statusMessage: "isReady is required" });
     }
 
-    await setIsAppReady(isReady);
+    setIsAppReady(isReady);
     console.log(`Updated IS_APP_READY to ${isReady}`);
 
     return { statusCode: 200, isReady };
   } catch (error) {
     console.log(error);
-    const err = error as { statusCode?: number; statusMessage?: string; message?: string };
     throw createError({
-      statusCode: err.statusCode,
-      statusMessage: err.statusMessage ?? err.message,
+      statusCode: 500,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/microservice/app/set_viewer_base_url.post.ts b/server/api/microservice/app/set_viewer_base_url.post.ts
index 78f101f4..f82abf35 100644
--- a/server/api/microservice/app/set_viewer_base_url.post.ts
+++ b/server/api/microservice/app/set_viewer_base_url.post.ts
@@ -1,5 +1,5 @@
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import { setViewerBaseUrl } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
@@ -8,20 +8,19 @@ interface SetViewerBaseUrlBody {
   baseUrl: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { baseUrl } = await readBody<SetViewerBaseUrlBody>(event);
     if (!baseUrl) {
       throw createError({ statusCode: 400, statusMessage: "baseUrl is required" });
     }
-    await setViewerBaseUrl(baseUrl);
+    setViewerBaseUrl(baseUrl);
     return { statusCode: 200, baseUrl };
   } catch (error) {
     console.log(error);
-    const err = error as { statusCode?: number; message?: string };
     throw createError({
-      statusCode: err.statusCode,
-      statusMessage: err.message,
+      statusCode: 500,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/microservice/extensions/download.post.ts b/server/api/microservice/extensions/download.post.ts
index 98ff4b91..4ca4f69e 100644
--- a/server/api/microservice/extensions/download.post.ts
+++ b/server/api/microservice/extensions/download.post.ts
@@ -2,7 +2,7 @@
 import { promises as fs } from "node:fs";
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 
 // Local imports
 import {
@@ -16,12 +16,13 @@ interface DownloadExtensionBody {
   extensionFileName: string;
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const body = await readBody<DownloadExtensionBody>(event);
     const { projectName, url, extensionFileName } = body;
     console.log({ projectName, url, extensionFileName });
-    const fileBuffer = await fetch(url).then((file) => file.arrayBuffer());
+    const response: Readonly<Response> = await fetch(url);
+    const fileBuffer = await response.arrayBuffer();
     const filePath = targetExtensionFilePath(projectName, extensionFileName);
     await fs.writeFile(filePath, Buffer.from(fileBuffer));
     await registerExtensionFile(projectName, filePath);
@@ -32,7 +33,7 @@ export default defineEventHandler(async (event) => {
     console.error("Error downloading extension:", error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/api/serverless/run_cloud.post.ts b/server/api/serverless/run_cloud.post.ts
index 03e80aa7..a65dace6 100644
--- a/server/api/serverless/run_cloud.post.ts
+++ b/server/api/serverless/run_cloud.post.ts
@@ -1,8 +1,8 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3";
-import { GoogleAuth } from "google-auth-library";
+import { GoogleAuth, type JWTInput } from "google-auth-library";
+import { type H3Event, createError, defineEventHandler, readBody } from "h3";
 import { ServicesClient } from "@google-cloud/run";
 
 // Local imports
@@ -12,17 +12,52 @@ interface RunCloudBody {
   email: string;
 }
 
-export default defineEventHandler(async (event) => {
+function isServiceAccountCredentials(value: unknown): value is JWTInput {
+  return (
+    typeof value === "object" && value !== null && "client_email" in value && "private_key" in value
+  );
+}
+
+export default defineEventHandler(async (event: H3Event) => {
   try {
     const { email } = await readBody<RunCloudBody>(event);
     console.log("[RUN CLOUD] Received request to create backend for email:", email);
-    const credentials = JSON.parse(process.env.GOOGLE_CLOUD_KEY as string);
+
+    const { GOOGLE_CLOUD_KEY, GOOGLE_CLOUD_PROJECT, PROJECT } = process.env;
+
+    if (
+      GOOGLE_CLOUD_KEY === undefined ||
+      GOOGLE_CLOUD_KEY === "" ||
+      GOOGLE_CLOUD_PROJECT === undefined ||
+      GOOGLE_CLOUD_PROJECT === "" ||
+      PROJECT === undefined ||
+      PROJECT === ""
+    ) {
+      throw createError({
+        statusCode: 500,
+        statusMessage:
+          "Missing required environment variables: GOOGLE_CLOUD_KEY, GOOGLE_CLOUD_PROJECT, or PROJECT",
+      });
+    }
+
+    const projectId: string = GOOGLE_CLOUD_PROJECT;
+    const projectName: string = PROJECT;
+
+    const parsedKey: unknown = JSON.parse(GOOGLE_CLOUD_KEY);
+    if (!isServiceAccountCredentials(parsedKey)) {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "GOOGLE_CLOUD_KEY is not a valid service account credentials JSON",
+      });
+    }
+    const credentials: JWTInput = parsedKey;
+
     const location = "europe-west9";
-    const projectId = process.env.GOOGLE_CLOUD_PROJECT;
-    const projectName = process.env.PROJECT as string;
     const parent = `projects/${projectId}/locations/${location}`;
     console.log({ parent });
+
     const auth = new GoogleAuth({
+      // oxlint-disable-next-line typescript/no-deprecated
       credentials,
       scopes: ["https://www.googleapis.com/auth/cloud-platform"],
     });
@@ -30,21 +65,28 @@ export default defineEventHandler(async (event) => {
     const image = await artifactImage(parent, authClient);
     const request = requestConfig(parent, image, email, projectName);
     console.log({ request });
-    // @google-cloud/run bundles its own copy of google-auth-library's auth-client types,
-    // Which isn't nominally assignable to the AuthClient from our direct dependency.
-    const runClient = new ServicesClient({ authClient: authClient as never });
+
+    const runClient = new ServicesClient({ authClient });
     const [operation] = await runClient.createService(request);
     const [response] = await operation.promise();
+
+    if (response.uri === null || response.uri === undefined || response.uri === "") {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Cloud Run service created but no URI was returned",
+      });
+    }
+
     console.log("Service URL created:", response.uri);
     return {
       statusCode: 200,
-      url: (response.uri as string).replace(/^https?:\/\//iu, ""),
+      url: response.uri.replace(/^https?:\/\//iu, ""),
     };
   } catch (error) {
     console.log(error);
     throw createError({
       statusCode: 500,
-      statusMessage: (error as Error).message,
+      statusMessage: error instanceof Error ? error.message : String(error),
     });
   }
 });
diff --git a/server/types/vendor.d.ts b/server/types/vendor.d.ts
deleted file mode 100644
index 2492929a..00000000
--- a/server/types/vendor.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Minimal ambient typings for third-party packages used under server/ that ship no types of their own and have no @types/* package installed. Only the members this codebase actually uses are declared.
-// This file declares ambient types for two separate untyped packages (`ws` and `busboy`); splitting it in two would just be file-count churn for a couple of small, always-imported-together vendor shims. Its short identifiers (`on`, `id`, ...) mirror the real, external APIs they type - renaming them here wouldn't change the names real callers already use.
-// oxlint-disable eslint/max-classes-per-file, eslint/id-length
-
-declare module "ws" {
-  type RawData = string | Buffer | ArrayBuffer | Buffer[];
-
-  class WebSocket {
-    static readonly CONNECTING: number;
-    static readonly OPEN: number;
-    static readonly CLOSING: number;
-    static readonly CLOSED: number;
-
-    constructor(address: string);
-
-    readyState: number;
-
-    on(event: "open", listener: () => void): this;
-    on(event: "message", listener: (data: RawData) => void): this;
-    on(event: "close", listener: (code?: number, reason?: Buffer) => void): this;
-    on(event: "error", listener: (error: Error) => void): this;
-    once(event: string, listener: (...args: unknown[]) => void): this;
-
-    send(data: string): void;
-    close(): void;
-  }
-
-  export { WebSocket };
-}
-
-declare module "busboy" {
-  import type { Readable, Writable } from "node:stream";
-
-  interface BusboyFileInfo {
-    filename: string;
-    encoding: string;
-    mimeType: string;
-  }
-
-  interface BusboyConfig {
-    headers: Record<string, string | string[] | undefined>;
-    limits?: {
-      fileSize?: number;
-      files?: number;
-      [key: string]: number | undefined;
-    };
-  }
-
-  class Busboy extends Writable {
-    on(event: "field", listener: (name: string, value: string) => void): this;
-    on(
-      event: "file",
-      listener: (fieldname: string, fileStream: Readable, info: BusboyFileInfo) => void,
-    ): this;
-    on(event: "filesLimit", listener: () => void): this;
-    on(event: "partsLimit", listener: () => void): this;
-    on(event: "finish", listener: () => void): this;
-    on(event: "close", listener: () => void): this;
-  }
-
-  function busboy(config: BusboyConfig): Busboy;
-
-  export = busboy;
-}
diff --git a/server/utils/app_config.ts b/server/utils/app_config.ts
index 8d2d5413..6caaf265 100644
--- a/server/utils/app_config.ts
+++ b/server/utils/app_config.ts
@@ -1,6 +1,6 @@
 // Node.js imports
 import path from "node:path";
-import { unlink } from "node:fs";
+import { unlink } from "node:fs/promises";
 
 // Third party imports
 import Conf from "conf";
@@ -13,7 +13,7 @@ interface ExtensionsConfigSchema {
   extensions: Record<string, { path: string }>;
 }
 
-function projectConf(projectName: string) {
+function projectConf(projectName: string): Conf<ExtensionsConfigSchema> {
   const projectConfig = new Conf<ExtensionsConfigSchema>({
     projectName,
   });
@@ -22,16 +22,19 @@ function projectConf(projectName: string) {
   });
   return projectConfig;
 }
-function confFolderPath(projectName: string) {
+
+function confFolderPath(projectName: string): string {
   const projectConfig = projectConf(projectName);
   return path.dirname(projectConfig.path);
 }
-function targetExtensionFilePath(projectName: string, filename: string) {
+
+function targetExtensionFilePath(projectName: string, filename: string): string {
   const safeFilename = sanitize(filename);
   const targetPath = path.join(confFolderPath(projectName), safeFilename);
   return targetPath;
 }
-function extensionsConf(projectName: string) {
+
+function extensionsConf(projectName: string): ExtensionsConfigSchema["extensions"] {
   const projectConfig = projectConf(projectName);
   if (!projectConfig.has("extensions")) {
     projectConfig.set("extensions", {});
@@ -39,28 +42,25 @@ function extensionsConf(projectName: string) {
   const extensionsConfig = projectConfig.get("extensions");
   return extensionsConfig;
 }
+
 function addExtensionToConf(
   projectName: string,
-  { extensionId, extensionPath }: { extensionId: string; extensionPath: string },
-) {
+  { extensionId, extensionPath }: Readonly<{ extensionId: string; extensionPath: string }>,
+): void {
   const projectConfig = projectConf(projectName);
   projectConfig.set(`extensions.${extensionId}.path`, extensionPath);
 }
 
 function extensionPathFromConf(projectName: string, extensionId: string): string {
   const projectConfig = projectConf(projectName);
-  return projectConfig.get(`extensions.${extensionId}.path`) as string;
+  return projectConfig.get(`extensions.${extensionId}.path`);
 }
 
-async function removeExtensionFromConf(projectName: string, extensionId: string) {
+async function removeExtensionFromConf(projectName: string, extensionId: string): Promise<void> {
   const projectConfig = projectConf(projectName);
   const extensionArchivePath = extensionPathFromConf(projectName, extensionId);
-  await unlink(extensionArchivePath, (error) => {
-    if (error) {
-      throw error;
-    }
-    console.log(`${extensionArchivePath} was deleted`);
-  });
+  await unlink(extensionArchivePath);
+  console.log(`${extensionArchivePath} was deleted`);
   projectConfig.delete(`extensions.${extensionId}`);
   console.log(`${extensionId} was deleted from ${projectName} config`);
 }
@@ -70,20 +70,30 @@ interface ExtensionMetadata {
   [key: string]: unknown;
 }
 
-async function registerExtensionFile(projectName: string, file: string) {
+function isExtensionMetadata(value: unknown): value is ExtensionMetadata {
+  return (
+    typeof value === "object" && value !== null && "id" in value && typeof value.id === "string"
+  );
+}
+
+async function registerExtensionFile(projectName: string, file: string): Promise<void> {
   const StreamZipAsync = StreamZip.async;
   const zip = new StreamZipAsync({
     file,
     storeEntries: true,
   });
   const metadataJson = await zip.entryData("metadata.json");
-  const metadata = JSON.parse(metadataJson.toString("utf8")) as ExtensionMetadata;
-  const { id } = metadata;
+  const parsedMetadata: unknown = JSON.parse(metadataJson.toString("utf8"));
+  if (!isExtensionMetadata(parsedMetadata)) {
+    throw new TypeError("metadata.json does not match the expected ExtensionMetadata shape");
+  }
+  const { id } = parsedMetadata;
   addExtensionToConf(projectName, {
     extensionId: id,
     extensionPath: file,
   });
 }
+
 export {
   addExtensionToConf,
   confFolderPath,
diff --git a/server/utils/cleanup.ts b/server/utils/cleanup.ts
index faf9440e..ae3282d3 100644
--- a/server/utils/cleanup.ts
+++ b/server/utils/cleanup.ts
@@ -1,4 +1,3 @@
-/// <reference path="../types/vendor.d.ts" />
 // Node imports
 import fs from "node:fs";
 import path from "node:path";
@@ -18,6 +17,7 @@ interface Microservice {
 }
 
 const MAX_DELETE_FOLDER_RETRIES = 5;
+
 async function deleteFolderRecursive(folderPath: string): Promise<void> {
   if (!fs.existsSync(folderPath)) {
     console.log(`Folder ${folderPath} does not exist.`);
@@ -32,7 +32,6 @@ async function deleteFolderRecursive(folderPath: string): Promise<void> {
       return;
     } catch (error) {
       console.error(`Error deleting folder ${folderPath}:`, error);
-      // Wait before retrying
       const MILLISECONDS_PER_RETRY = 1000;
       const DELAY = MILLISECONDS_PER_RETRY * (i + 1);
       // oxlint-disable-next-line no-await-in-loop
@@ -44,35 +43,54 @@ async function deleteFolderRecursive(folderPath: string): Promise<void> {
     `Failed to delete folder ${folderPath} after ${MAX_DELETE_FOLDER_RETRIES} retries`,
   );
 }
-function killHttpMicroservice(microservice: Microservice): Promise<void> {
+
+function isErrorWithMessage(error: unknown): error is { message: string } {
+  return (
+    typeof error === "object" &&
+    error !== null &&
+    "message" in error &&
+    typeof error.message === "string"
+  );
+}
+
+async function killHttpMicroservice(microservice: Readonly<Microservice>): Promise<void> {
   console.log("killHttpMicroservice", {
     ...microservice,
   });
   const failMessage = `Failed to kill ${microservice.name}`;
-  async function do_kill() {
+  async function do_kill(): Promise<void> {
+    if (microservice.url === undefined) {
+      return;
+    }
     try {
-      await fetch(microservice.url as string, {
+      await fetch(microservice.url, {
         method: microservice.method,
       });
     } catch (error) {
-      console.log(`Expected error during kill of ${microservice.name}:`, (error as Error).message);
+      const message = isErrorWithMessage(error) ? error.message : String(error);
+      console.log(`Expected error during kill of ${microservice.name}:`, message);
     }
   }
-  return pTimeout(do_kill(), {
+  await pTimeout(do_kill(), {
     milliseconds: 5000,
     message: failMessage,
   });
 }
-function killWebsocketMicroservice(microservice: Microservice): Promise<void> {
+
+async function killWebsocketMicroservice(microservice: Readonly<Microservice>): Promise<void> {
   console.log("killWebsocketMicroservice", {
     ...microservice,
   });
   const failMessage = `Failed to kill ${microservice.name}`;
   const successMessage = `Disconnected from ${microservice.name} WebSocket server`;
-  function do_kill() {
+  async function do_kill(): Promise<void> {
+    if (microservice.url === undefined) {
+      return;
+    }
+    const socketUrl = microservice.url;
     // oxlint-disable-next-line promise/avoid-new
-    return new Promise<void>((resolve) => {
-      const socket = new WebSocket(microservice.url as string);
+    await new Promise<void>((resolve) => {
+      const socket = new WebSocket(socketUrl);
       socket.on("open", () => {
         console.log("Connected to WebSocket server");
         socket.send(
@@ -87,7 +105,7 @@ function killWebsocketMicroservice(microservice: Microservice): Promise<void> {
           }),
         );
       });
-      socket.on("message", (data) => {
+      socket.on("message", (data: Buffer | string) => {
         const message = data.toString();
         console.log("Received from server:", message);
         if (message.includes("hello")) {
@@ -106,46 +124,56 @@ function killWebsocketMicroservice(microservice: Microservice): Promise<void> {
         console.log(successMessage);
         resolve();
       });
-      socket.on("error", (error) => {
+      socket.on("error", (error: Readonly<Error>) => {
         console.error("WebSocket error:", error);
         socket.close();
         resolve();
       });
     });
   }
-  return pTimeout(do_kill(), {
+  await pTimeout(do_kill(), {
     milliseconds: 5000,
     message: failMessage,
   });
 }
-async function killMicroservice(microservice: Microservice): Promise<void> {
+
+async function killMicroservice(microservice: Readonly<Microservice>): Promise<void> {
   if (microservice.type === "back") {
     await killHttpMicroservice(microservice);
   } else if (microservice.type === "viewer") {
     await killWebsocketMicroservice(microservice);
   } else {
-    throw new Error(`Unknown microservice type: ${microservice.type}`);
+    const exhaustiveCheck: never = microservice.type;
+    throw new Error(`Unknown microservice type: ${String(exhaustiveCheck)}`);
   }
 }
-async function killMicroservices(microservices: Microservice[]): Promise<void> {
+
+async function killMicroservices(
+  microservices: readonly Readonly<Microservice>[],
+): Promise<Readonly<Microservice>[]> {
   console.log("killMicroservices", {
     microservices,
   });
   const results = await Promise.allSettled(
-    microservices.map((microservice) => killMicroservice(microservice)),
+    microservices.map(async (microservice) => {
+      await killMicroservice(microservice);
+    }),
   );
-  const killed = microservices.filter((_, index) => results[index]?.status === "fulfilled");
-  for (let i = 0; i < killed.length; i += 1) {
-    const microservice = microservices[i];
-    if (microservice) {
-      microservices.splice(microservices.indexOf(microservice), 1);
-    }
-  }
+  return microservices.filter((_, index) => results[index]?.status !== "fulfilled");
 }
+
 function microservicesMetadatasPath(projectFolderPath: string): string {
   return path.join(projectFolderPath, "microservices.json");
 }
 
+function isMicroservicesMetadatas(value: unknown): value is { microservices: Microservice[] } {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    Array.isArray((value as { microservices?: unknown }).microservices)
+  );
+}
+
 function projectMicroservices(projectFolderPath: string): Microservice[] {
   console.log("projectMicroservices", {
     projectFolderPath,
@@ -157,11 +185,13 @@ function projectMicroservices(projectFolderPath: string): Microservice[] {
     };
     fs.writeFileSync(filePath, JSON.stringify(microservicesMetadatas, undefined, 2), "utf8");
   }
-  const content = JSON.parse(fs.readFileSync(filePath, "utf8")) as {
-    microservices: Microservice[];
-  };
-  return content.microservices;
+  const parsed: unknown = JSON.parse(fs.readFileSync(filePath, "utf8"));
+  if (!isMicroservicesMetadatas(parsed)) {
+    throw new Error(`Invalid microservices metadata file: ${filePath}`);
+  }
+  return parsed.microservices;
 }
+
 async function cleanupBackend(projectFolderPath: string): Promise<void> {
   if (!fs.existsSync(projectFolderPath)) {
     console.log(`Folder ${projectFolderPath} does not exist. Skipping cleanup.`);
@@ -171,11 +201,13 @@ async function cleanupBackend(projectFolderPath: string): Promise<void> {
   await killMicroservices(microservices);
   await deleteFolderRecursive(projectFolderPath);
 }
+
 function getMicroserviceByName(
-  microservices: Microservice[],
+  microservices: readonly Readonly<Microservice>[],
   name: string,
 ): Microservice | undefined {
-  return microservices.find((microservice) => microservice.name === name);
+  const found = microservices.find((microservice) => microservice.name === name);
+  return found === undefined ? undefined : { ...found };
 }
 
 export {
diff --git a/server/utils/cloud.ts b/server/utils/cloud.ts
index 336a908c..55c02c80 100644
--- a/server/utils/cloud.ts
+++ b/server/utils/cloud.ts
@@ -4,25 +4,23 @@ import fs from "node:fs";
 import path from "node:path";
 
 // Third party imports
+import type { AuthClient, OAuth2Client } from "google-auth-library";
 import { google } from "googleapis";
 import type { protos } from "@google-cloud/run";
 
 // Local imports
 
-// The googleapis package's per-API-version `auth` option types don't line up with the concrete client returned by `GoogleAuth.getClient()` (they're structurally close but not nominally assignable). `any` matches how googleapis treats it at runtime (duck typed).
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type GoogleAuthClient = any;
-// `v2` is a namespace segment in the `@google-cloud/run` package's own generated protobuf types, not a name this codebase declares.
 // oxlint-disable-next-line eslint/id-length
 type CreateServiceRequest = protos.google.cloud.run.v2.ICreateServiceRequest;
 
 const LOCATIONS_DIR = "/etc/nginx/locations";
 
-async function artifactImage(parent: string, authClient: GoogleAuthClient): Promise<string> {
+async function artifactImage(parent: string, authClient: AuthClient): Promise<string> {
   const projectName = process.env.PROJECT;
   const registry = google.artifactregistry({
     version: "v1",
-    auth: authClient,
+    // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+    auth: authClient as OAuth2Client,
   });
   const branch = process.env.NETLIFY_BRANCH;
   const [, projectId] = parent.split("/");
@@ -112,7 +110,11 @@ function requestConfig(
   };
 }
 
-function addSupervisorProgram(name: string, command: string, executableArgs: string[]): void {
+function addSupervisorProgram(
+  name: string,
+  command: string,
+  executableArgs: readonly string[],
+): void {
   const conf = `
 [program:${name}]
 command=${command} ${executableArgs.join(" ")}
diff --git a/server/utils/extension.ts b/server/utils/extension.ts
index ded507b1..562afa5a 100644
--- a/server/utils/extension.ts
+++ b/server/utils/extension.ts
@@ -1,6 +1,7 @@
 // Node imports
 import { promises as fs } from "node:fs";
 import path from "node:path";
+import { z } from "zod";
 
 // Third party imports
 import { createError } from "h3";
@@ -8,14 +9,17 @@ import { createError } from "h3";
 // Local imports
 import { extensionFrontendPath } from "@geode/opengeodeweb-front/server/utils/path.ts";
 
-interface ExtensionMetadata {
-  id: string;
-  name: string;
-  version: string;
-  frontendFile: string;
-  backendExecutable: string;
-  [key: string]: unknown;
-}
+const extensionMetadataSchema = z
+  .object({
+    id: z.string(),
+    name: z.string(),
+    version: z.string(),
+    frontendFile: z.string(),
+    backendExecutable: z.string(),
+  })
+  .loose();
+
+type ExtensionMetadata = z.infer<typeof extensionMetadataSchema>;
 
 async function readExtensionMetadata(unzippedExtensionPath: string): Promise<ExtensionMetadata> {
   const metadataPath = path.join(unzippedExtensionPath, "metadata.json");
@@ -26,7 +30,17 @@ async function readExtensionMetadata(unzippedExtensionPath: string): Promise<Ext
       statusMessage: "Invalid extension file: missing metadata.json",
     });
   }
-  const metadata = JSON.parse(metadataContent) as ExtensionMetadata;
+
+  const parsed: unknown = JSON.parse(metadataContent);
+  const result = extensionMetadataSchema.safeParse(parsed);
+  if (!result.success) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Invalid extension file: malformed metadata.json",
+    });
+  }
+  const metadata = result.data;
+
   console.log("readExtensionMetadata", { metadata });
   if (!metadata.frontendFile) {
     throw createError({
diff --git a/server/utils/microservices.ts b/server/utils/microservices.ts
index 4a8bcae2..9e92e644 100644
--- a/server/utils/microservices.ts
+++ b/server/utils/microservices.ts
@@ -1,5 +1,3 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 // Node imports
 import child_process from "node:child_process";
 import fs from "node:fs";
@@ -9,13 +7,9 @@ import path from "node:path";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json" with { type: "json" };
 
 // Local imports
+import { type Microservice, microservicesMetadatasPath, projectMicroservices } from "./cleanup.js";
+import { type NamedChildProcess, getAvailablePort, waitForReady } from "./scripts.js";
 import { addNginxLocation, addSupervisorProgram } from "./cloud.js";
-import { getAvailablePort, waitForReady } from "./scripts.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { NamedChildProcess } from "./scripts.js";
-import { microservicesMetadatasPath, projectMicroservices } from "./cleanup.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Microservice } from "./cleanup.js";
 import { executablePath } from "./path.js";
 
 interface RunArgs {
@@ -27,11 +21,12 @@ interface RunArgs {
 const MILLISECONDS_PER_SECOND = 1000;
 const DEFAULT_TIMEOUT_SECONDS = 45;
 const MAX_PORT_RETRIES = 1;
-const DEFAULT_RUN_ARGS: RunArgs = { projectFolderPath: "" };
+const DEFAULT_RUN_ARGS: Readonly<RunArgs> = { projectFolderPath: "" };
+
 async function runScript(
   execPath: string,
   execName: string,
-  args: string[],
+  args: readonly string[],
   expectedResponse: string,
   timeoutSeconds = DEFAULT_TIMEOUT_SECONDS,
 ): Promise<NamedChildProcess> {
@@ -45,7 +40,9 @@ async function runScript(
     console.log(`[${child.name}] spawned, pid=${child.pid}`);
   });
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutSeconds * MILLISECONDS_PER_SECOND);
+  const timer = setTimeout(() => {
+    controller.abort();
+  }, timeoutSeconds * MILLISECONDS_PER_SECOND);
   if (typeof timer.unref === "function") {
     timer.unref();
   }
@@ -59,16 +56,20 @@ async function runScript(
     throw error;
   }
 }
+
 function isPortInUseError(error: unknown): boolean {
   return /EADDRINUSE|address already in use|port already in use/iu.test(String(error));
 }
 
-function backArgs(args: RunArgs, port: number): string[] {
+function backArgs(args: Readonly<RunArgs>, port: number): string[] {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
   }
-  const uploadFolderPath = args.uploadFolderPath || path.join(projectFolderPath, "uploads");
+  const uploadFolderPath =
+    args.uploadFolderPath !== undefined && args.uploadFolderPath !== ""
+      ? args.uploadFolderPath
+      : path.join(projectFolderPath, "uploads");
   const executableArgs = [
     "--port",
     String(port),
@@ -81,7 +82,7 @@ function backArgs(args: RunArgs, port: number): string[] {
     "--timeout",
     "0",
   ];
-  if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+  if (process.env.NODE_ENV === undefined || process.env.NODE_ENV === "development") {
     executableArgs.push("--debug");
   }
   return executableArgs;
@@ -90,9 +91,9 @@ function backArgs(args: RunArgs, port: number): string[] {
 async function runBack(
   execName: string,
   execPath: string,
-  args: RunArgs = DEFAULT_RUN_ARGS,
+  args: Readonly<RunArgs> = DEFAULT_RUN_ARGS,
   attempts = 0,
-): Promise<number | undefined> {
+): Promise<number> {
   let port: number | undefined = undefined;
   try {
     port = await getAvailablePort();
@@ -111,15 +112,15 @@ async function runBack(
       return newPort;
     }
   }
-  return undefined;
+  throw new Error(`runBack failed to run ${execName}`);
 }
 
 async function runViewer(
   execName: string,
   execPath: string,
-  args: RunArgs = DEFAULT_RUN_ARGS,
+  args: Readonly<RunArgs> = DEFAULT_RUN_ARGS,
   attempts = 0,
-): Promise<number | undefined> {
+): Promise<number> {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
@@ -140,7 +141,7 @@ async function runViewer(
     return port;
   } catch (error) {
     if (!isPortInUseError(error)) {
-      console.log("runBack error", error);
+      console.log("runViewer error", error);
       throw error;
     }
     if (attempts <= MAX_PORT_RETRIES) {
@@ -149,16 +150,16 @@ async function runViewer(
       return newPort;
     }
   }
-  return undefined;
+  throw new Error(`runViewer failed to run ${execName}`);
 }
 
 async function runExtension(
   extensionId: string,
   execName: string,
   execPath: string,
-  args: RunArgs = DEFAULT_RUN_ARGS,
+  args: Readonly<RunArgs> = DEFAULT_RUN_ARGS,
   attempts = 0,
-): Promise<number | undefined> {
+): Promise<number> {
   let port: number | undefined = undefined;
   try {
     port = await getAvailablePort();
@@ -170,7 +171,7 @@ async function runExtension(
     return port;
   } catch (error) {
     if (!isPortInUseError(error)) {
-      console.log("runBack error", error);
+      console.log("runExtension error", error);
       throw error;
     }
     if (attempts <= MAX_PORT_RETRIES) {
@@ -179,19 +180,29 @@ async function runExtension(
       return newPort;
     }
   }
-  return undefined;
+  throw new Error(`runExtension failed to run ${extensionId}`);
 }
-function addMicroserviceMetadatas(projectFolderPath: string, serviceObj: Microservice): void {
+function addMicroserviceMetadatas(
+  projectFolderPath: string,
+  serviceObj: Readonly<Microservice>,
+): void {
   const microservices = projectMicroservices(projectFolderPath);
+  let enriched: Microservice = { ...serviceObj };
   if (serviceObj.type === "back") {
     const schema = back_schemas.opengeodeweb_back.kill;
-    serviceObj.url = `http://localhost:${serviceObj.port}/${schema.$id}`;
     const [method] = schema.methods;
-    serviceObj.method = method;
+    enriched = {
+      ...enriched,
+      url: `http://localhost:${serviceObj.port}/${schema.$id}`,
+      method,
+    };
   } else if (serviceObj.type === "viewer") {
-    serviceObj.url = `ws://localhost:${serviceObj.port}/ws`;
+    enriched = {
+      ...enriched,
+      url: `ws://localhost:${serviceObj.port}/ws`,
+    };
   }
-  microservices.push(serviceObj);
+  microservices.push(enriched);
   fs.writeFileSync(
     microservicesMetadatasPath(projectFolderPath),
     JSON.stringify(
@@ -203,4 +214,5 @@ function addMicroserviceMetadatas(projectFolderPath: string, serviceObj: Microse
     ),
   );
 }
+
 export { addMicroserviceMetadatas, runBack, runExtension, runViewer };
diff --git a/server/utils/path.ts b/server/utils/path.ts
index 22b42137..c3e8b1c2 100644
--- a/server/utils/path.ts
+++ b/server/utils/path.ts
@@ -53,13 +53,13 @@ function executablePath(execPath: string, execName: string): string {
   }
 
   const foundAtExecPath = findExecutableInDir(execPath, execName, osExecutableName);
-  if (foundAtExecPath) {
+  if (foundAtExecPath !== undefined && foundAtExecPath !== "") {
     return foundAtExecPath;
   }
   if (mode === appMode.DESKTOP && nodeEnv === "production") {
-    if (resourcesPath) {
+    if (resourcesPath !== undefined && resourcesPath !== "") {
       const foundInResources = findExecutableInDir(resourcesPath, execName, osExecutableName);
-      if (foundInResources) {
+      if (foundInResources !== undefined && foundInResources !== "") {
         return foundInResources;
       }
     }
@@ -140,7 +140,7 @@ async function extensionFrontendPath(
     extentionRepoName,
     frontendFile,
   );
-  if (localFilePath) {
+  if (localFilePath !== undefined && localFilePath !== "") {
     return localFilePath;
   }
   const unzippedfrontendFilePath = path.join(unzippedExtensionPath, frontendFile);
diff --git a/server/utils/scripts.ts b/server/utils/scripts.ts
index e319d5e3..88ab851f 100644
--- a/server/utils/scripts.ts
+++ b/server/utils/scripts.ts
@@ -1,12 +1,10 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 // Node imports
+import type { Readable } from "node:stream";
 import child_process from "node:child_process";
 import fs from "node:fs";
 import { on } from "node:events";
 import path from "node:path";
 import readline from "node:readline";
-import type { Readable } from "node:stream";
 
 // Third party imports
 import { getPort } from "get-port-please";
@@ -18,19 +16,23 @@ import { setAppBaseUrl } from "@geode/opengeodeweb-front/shared/scripts.ts";
 const BYTES_PER_KIBIBYTE = 1024;
 const MAX_ERROR_BUFFER_KIBIBYTES = 64;
 const MAX_ERROR_BUFFER_BYTES = MAX_ERROR_BUFFER_KIBIBYTES * BYTES_PER_KIBIBYTE;
-function getAvailablePort(): Promise<number> {
-  return getPort({
+
+async function getAvailablePort(): Promise<number> {
+  const port = await getPort({
     host: "localhost",
     random: true,
   });
+  return port;
 }
+
 function commandExistsSync(execName: string): boolean {
-  const envPath = process.env.PATH || "";
+  const envPath = process.env.PATH ?? "";
   return envPath.split(path.delimiter).some((directory) => {
     const filePath = path.join(directory, execName);
     return fs.existsSync(filePath) && fs.statSync(filePath).isFile();
   });
 }
+
 const encoder = new TextEncoder();
 function byteLength(str: string): number {
   return encoder.encode(str).byteLength;
@@ -40,11 +42,11 @@ interface NamedChildProcess extends child_process.ChildProcessByStdio<null, Read
   name?: string;
 }
 
-// oxlint-disable-next-line max-lines-per-function
-function waitForReady(
+// oxlint-disable-next-line max-lines-per-function typescript/prefer-readonly-parameter-types eslint/require-await
+async function waitForReady(
   child: NamedChildProcess,
   expectedResponse: string,
-  signal?: AbortSignal,
+  signal?: Readonly<AbortSignal>,
 ): Promise<NamedChildProcess> {
   // oxlint-disable-next-line promise/avoid-new
   return new Promise((resolve, reject) => {
@@ -55,7 +57,7 @@ function waitForReady(
       input: child.stderr,
     });
     let recentOutput = "";
-    function recordOutput(lineOutput: string) {
+    function recordOutput(lineOutput: string): void {
       const safeLine =
         byteLength(lineOutput) > MAX_ERROR_BUFFER_BYTES / 2
           ? `${lineOutput.slice(0, MAX_ERROR_BUFFER_BYTES / 2)}…[truncated]`
@@ -72,11 +74,11 @@ function waitForReady(
     }
     let onLine: ((line: string) => void) | undefined = undefined;
     let onErrLine: ((line: string) => void) | undefined = undefined;
-    let onError: ((err: Error) => void) | undefined = undefined;
+    let onError: ((err: Readonly<Error>) => void) | undefined = undefined;
     let onClose: ((code: number | null) => void) | undefined = undefined;
     let onAbort: (() => void) | undefined = undefined;
 
-    function cleanup() {
+    function cleanup(): void {
       if (onLine) {
         readlineStdout.removeListener("line", onLine);
       }
@@ -94,7 +96,7 @@ function waitForReady(
       }
     }
 
-    function becomeReady() {
+    function becomeReady(): void {
       cleanup();
       readlineStdout.on("line", (line) => {
         console.log(`[${child.name}] ${line}`);
@@ -108,7 +110,7 @@ function waitForReady(
       resolve(child);
     }
 
-    onLine = (lineOutput) => {
+    onLine = (lineOutput): void => {
       console.log(`[${child.name}] ${lineOutput}`);
       recordOutput(lineOutput);
       if (lineOutput.includes(expectedResponse)) {
@@ -116,7 +118,7 @@ function waitForReady(
       }
     };
 
-    onErrLine = (line) => {
+    onErrLine = (line): void => {
       console.log(`[${child.name}] ${line}`);
       recordOutput(line);
       if (line.includes(expectedResponse)) {
@@ -124,12 +126,12 @@ function waitForReady(
       }
     };
 
-    onError = (err) => {
+    onError = (err): void => {
       cleanup();
       reject(err);
     };
 
-    onClose = (code) => {
+    onClose = (code): void => {
       console.log(`[${child.name}] exited with code ${code}`);
       cleanup();
       reject(
@@ -139,7 +141,7 @@ function waitForReady(
       );
     };
 
-    onAbort = () => {
+    onAbort = (): void => {
       cleanup();
       reject(new Error(`[${child.name}] timed out waiting for "${expectedResponse}"`));
     };
@@ -157,22 +159,23 @@ function waitForReady(
 async function waitNuxt(
   nuxtProcess: child_process.ChildProcessWithoutNullStreams,
 ): Promise<string> {
-  nuxtProcess.stderr.on("data", (data) => {
+  nuxtProcess.stderr.on("data", (data: Buffer) => {
     console.log("Nuxt STDERR:", data.toString().trim());
   });
   nuxtProcess.on("close", (code) => {
     console.log(`Nuxt process closed with code ${code}`);
   });
   for await (const [data] of on(nuxtProcess.stdout, "data")) {
-    const output = data.toString();
+    const output = String(data);
     console.log("Nuxt STDOUT:", output.trim());
-    const portMatch = output.match(/Listening on http:\/\/\[::\]:(?<port>\d+)/u);
-    if (portMatch?.groups) {
-      console.log("Nuxt listening on port", portMatch.groups.port);
-      nuxtProcess.stdout.on("data", (newData) => {
+    const portMatch = /Listening on http:\/\/\[::\]:(?<port>\d+)/u.exec(output);
+    const port = portMatch?.groups?.port;
+    if (port !== undefined) {
+      console.log("Nuxt listening on port", port);
+      nuxtProcess.stdout.on("data", (newData: Buffer) => {
         console.log("Nuxt STDOUT:", newData.toString().trim());
       });
-      return portMatch.groups.port as string;
+      return port;
     }
   }
   throw new Error("Nuxt process closed");
diff --git a/server/utils/server.ts b/server/utils/server.ts
index 7c9ee75c..2f8a990b 100644
--- a/server/utils/server.ts
+++ b/server/utils/server.ts
@@ -18,13 +18,13 @@ async function extractZipArchive(zipFilePath: string, outputDir: string): Promis
 
     if (zipEntry.dir) {
       promises.push(
-        (async () => {
+        (async (): Promise<void> => {
           await fs.promises.mkdir(outputPath, { recursive: true });
         })(),
       );
     } else {
       promises.push(
-        (async () => {
+        (async (): Promise<void> => {
           const content = await zipEntry.async("nodebuffer");
           await fs.promises.mkdir(path.dirname(outputPath), {
             recursive: true,
diff --git a/server/utils/server_config.ts b/server/utils/server_config.ts
index eb461b51..fe93f135 100644
--- a/server/utils/server_config.ts
+++ b/server/utils/server_config.ts
@@ -1,50 +1,64 @@
-import { createServerWsRpcClient } from "./ws_client.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { ServerWsRpcClient } from "./ws_client.js";
+import { type ServerWsRpcClient, createServerWsRpcClient } from "./ws_client.js";
 
-const storage = new Map<string, unknown>();
-function getAppBaseUrl(): unknown {
-  return storage.get("APP_BASE_URL");
+const stringStorage = new Map<string, string>();
+const booleanStorage = new Map<string, boolean>();
+const clientStorage = new Map<string, ServerWsRpcClient>();
+
+function getAppBaseUrl(): string {
+  const value = stringStorage.get("APP_BASE_URL");
+  if (value === undefined) {
+    throw new Error("APP_BASE_URL is not set");
+  }
+  return value;
 }
-function setAppBaseUrl(baseUrl: string) {
-  return storage.set("APP_BASE_URL", baseUrl);
+function setAppBaseUrl(baseUrl: string): void {
+  stringStorage.set("APP_BASE_URL", baseUrl);
 }
-function getBackBaseUrl(): unknown {
-  return storage.get("BACK_BASE_URL");
+function getBackBaseUrl(): string {
+  const value = stringStorage.get("BACK_BASE_URL");
+  if (value === undefined) {
+    throw new Error("BACK_BASE_URL is not set");
+  }
+  return value;
 }
-function setBackBaseUrl(baseUrl: string) {
-  return storage.set("BACK_BASE_URL", baseUrl);
+function setBackBaseUrl(baseUrl: string): void {
+  stringStorage.set("BACK_BASE_URL", baseUrl);
 }
-function getViewerBaseUrl(): unknown {
-  return storage.get("VIEWER_BASE_URL");
+function getViewerBaseUrl(): string {
+  const value = stringStorage.get("VIEWER_BASE_URL");
+  if (value === undefined) {
+    throw new Error("VIEWER_BASE_URL is not set");
+  }
+  return value;
 }
-function setViewerBaseUrl(baseUrl: string) {
-  return storage.set("VIEWER_BASE_URL", baseUrl);
+function setViewerBaseUrl(baseUrl: string): void {
+  stringStorage.set("VIEWER_BASE_URL", baseUrl);
 }
-function getIsAppReady(): unknown {
-  return storage.get("IS_APP_READY") ?? false;
+function getIsAppReady(): boolean {
+  return booleanStorage.get("IS_APP_READY") ?? false;
 }
-function setIsAppReady(isAppReady: boolean) {
-  return storage.set("IS_APP_READY", isAppReady);
+function setIsAppReady(isAppReady: boolean): void {
+  booleanStorage.set("IS_APP_READY", isAppReady);
 }
 async function setViewerWebSocketClient(baseUrl: string): Promise<ServerWsRpcClient> {
   const client = createServerWsRpcClient(baseUrl);
   client.onConnectionClose(() => {
-    if (storage.get("VIEWER_CLIENT") === client) {
-      storage.delete("VIEWER_CLIENT");
+    if (clientStorage.get("VIEWER_CLIENT") === client) {
+      clientStorage.delete("VIEWER_CLIENT");
     }
   });
   await client.ready;
-  storage.set("VIEWER_CLIENT", client);
+  clientStorage.set("VIEWER_CLIENT", client);
   return client;
 }
 async function getViewerWebSocketClient(): Promise<ServerWsRpcClient> {
-  const viewerClient = (storage.get("VIEWER_CLIENT") as ServerWsRpcClient | undefined) ?? undefined;
-  if (viewerClient?.isOpen()) {
+  const viewerClient = clientStorage.get("VIEWER_CLIENT");
+  if (viewerClient !== undefined && viewerClient.isOpen()) {
     return viewerClient;
   }
-  const viewerBaseUrl = (await getViewerBaseUrl()) as string;
-  return setViewerWebSocketClient(viewerBaseUrl);
+  const viewerBaseUrl = getViewerBaseUrl();
+  const client = await setViewerWebSocketClient(viewerBaseUrl);
+  return client;
 }
 export {
   getAppBaseUrl,
diff --git a/server/utils/stream.ts b/server/utils/stream.ts
new file mode 100644
index 00000000..acabcaa5
--- /dev/null
+++ b/server/utils/stream.ts
@@ -0,0 +1,6 @@
+import type { ReadableStream as NodeReadableStream } from "node:stream/web";
+
+export function toNodeWebStream(stream: ReadableStream): NodeReadableStream {
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+  return stream as NodeReadableStream;
+}
diff --git a/server/utils/ws_client.ts b/server/utils/ws_client.ts
index 26d2a4b9..059d8529 100644
--- a/server/utils/ws_client.ts
+++ b/server/utils/ws_client.ts
@@ -1,4 +1,3 @@
-/// <reference path="../types/vendor.d.ts" />
 // Third party imports
 import { WebSocket } from "ws";
 import { v4 as uuidv4 } from "uuid";
@@ -19,9 +18,29 @@ interface WsRpcMessage {
   result?: unknown;
 }
 
+function isWsRpcMessage(value: unknown): value is WsRpcMessage {
+  return typeof value === "object" && value !== null;
+}
+
+// oxlint-disable-next-line prefer-readonly-parameter-types
+function rawDataToString(raw: WebSocket.RawData): string {
+  if (Buffer.isBuffer(raw)) {
+    return raw.toString();
+  }
+  if (Array.isArray(raw)) {
+    return Buffer.concat(raw).toString();
+  }
+  return Buffer.from(raw).toString();
+}
+
 interface ServerWsRpcClient {
-  call: (rpc: string, params?: Record<string, unknown>) => Promise<unknown>;
+  call: (rpc: string, params?: Readonly<Record<string, unknown>>) => Promise<unknown>;
   close: () => void;
+  getConnection: () => {
+    getSession: () => {
+      call: (rpc: string, params: readonly [Readonly<Record<string, unknown>>]) => Promise<unknown>;
+    };
+  };
   isOpen: () => boolean;
   onConnectionClose: (callback: () => void) => void;
   onConnectionError: (callback: (error: unknown) => void) => void;
@@ -35,7 +54,7 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
   let onCloseCallback: (() => void) | undefined = undefined;
   let onErrorCallback: ((error: unknown) => void) | undefined = undefined;
 
-  //oxlint-disable-next-line promise/avoid-new
+  //oxlint-disable-next-line promise/avoid-new max-lines-per-function
   const ready = new Promise<void>((resolve, reject) => {
     socket.on("open", () => {
       socket.send(
@@ -47,11 +66,15 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
       );
     });
 
-    socket.on("message", (raw) => {
-      console.log("RAW WS MESSAGE:", raw.toString());
+    // oxlint-disable-next-line prefer-readonly-parameter-types
+    socket.on("message", (raw: WebSocket.RawData) => {
       let message: WsRpcMessage | undefined = undefined;
       try {
-        message = JSON.parse(raw.toString()) as WsRpcMessage;
+        const parsed: unknown = JSON.parse(rawDataToString(raw));
+        if (!isWsRpcMessage(parsed)) {
+          return;
+        }
+        message = parsed;
       } catch {
         return;
       }
@@ -71,13 +94,13 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
       }
       pending.delete(message.id);
       if (message.error) {
-        entry.reject(new Error(message.error.message || "wslink RPC error"));
+        entry.reject(new Error(message.error.message ?? "wslink RPC error"));
       } else {
         entry.resolve(message.result);
       }
     });
 
-    socket.on("error", (error) => {
+    socket.on("error", (error: Readonly<Error>) => {
       onErrorCallback?.(error);
       reject(error);
     });
@@ -91,7 +114,10 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
     });
   });
 
-  async function call(rpc: string, params: Record<string, unknown> = {}): Promise<unknown> {
+  async function call(
+    rpc: string,
+    params: Readonly<Record<string, unknown>> = {},
+  ): Promise<unknown> {
     await ready;
     const id = uuidv4();
     //oxlint-disable-next-line promise/avoid-new
@@ -113,6 +139,15 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
     socket.close();
   }
 
+  function getConnection(): ReturnType<ServerWsRpcClient["getConnection"]> {
+    return {
+      getSession: () => ({
+        call: (rpc: string, [params]: readonly [Readonly<Record<string, unknown>>]) =>
+          call(rpc, params),
+      }),
+    };
+  }
+
   function isOpen(): boolean {
     return socket.readyState === WebSocket.OPEN;
   }
@@ -127,7 +162,7 @@ function createServerWsRpcClient(baseUrl: string): ServerWsRpcClient {
     onErrorCallback = callback;
   }
 
-  return { call, close, isOpen, onConnectionClose, onConnectionError, ready };
+  return { call, close, getConnection, isOpen, onConnectionClose, onConnectionError, ready };
 }
 
 export { createServerWsRpcClient };
diff --git a/shared/scripts.ts b/shared/scripts.ts
index f6399570..d7e0d598 100644
--- a/shared/scripts.ts
+++ b/shared/scripts.ts
@@ -7,38 +7,43 @@ import { fetchSchema } from "./utils/fetch_schema.js";
 
 import opengeodeweb_front_schemas from "@geode/opengeodeweb-front/opengeodeweb_front_schemas.json" with { type: "json" };
 
-function setAppBaseUrl(appBaseUrl: string) {
+async function setAppBaseUrl(appBaseUrl: string): Promise<unknown> {
   console.log("[API] setAppBaseUrl", appBaseUrl);
   const schema = opengeodeweb_front_schemas.api.microservice.app.set_app_base_url;
   const params = { baseUrl: appBaseUrl };
-  return fetchSchema({ schema, params, baseURL: appBaseUrl });
+  const result = await fetchSchema({ schema, params, baseURL: appBaseUrl });
+  return result;
 }
 
-function setBackBaseUrl(appBaseUrl: string, backBaseUrl: string) {
+async function setBackBaseUrl(appBaseUrl: string, backBaseUrl: string): Promise<unknown> {
   console.log("[API] setBackBaseUrl", appBaseUrl, backBaseUrl);
   const schema = opengeodeweb_front_schemas.api.microservice.app.set_back_base_url;
   const params = { baseUrl: backBaseUrl };
-  return fetchSchema({ schema, params, baseURL: appBaseUrl });
+  const result = await fetchSchema({ schema, params, baseURL: appBaseUrl });
+  return result;
 }
 
-function setViewerBaseUrl(appBaseUrl: string, viewerBaseUrl: string) {
+async function setViewerBaseUrl(appBaseUrl: string, viewerBaseUrl: string): Promise<unknown> {
   console.log("[API] setViewerBaseUrl", appBaseUrl, viewerBaseUrl);
   const schema = opengeodeweb_front_schemas.api.microservice.app.set_viewer_base_url;
   const params = { baseUrl: viewerBaseUrl };
-  return fetchSchema({ schema, params, baseURL: appBaseUrl });
+  const result = await fetchSchema({ schema, params, baseURL: appBaseUrl });
+  return result;
 }
 
-function setIsAppReady(appBaseUrl: string, isReady: boolean) {
+async function setIsAppReady(appBaseUrl: string, isReady: boolean): Promise<unknown> {
   console.log("[API] setIsAppReady", isReady);
   const schema = opengeodeweb_front_schemas.api.microservice.app.set_is_app_ready;
   const params = { isReady };
-  return fetchSchema({ schema, params, baseURL: appBaseUrl });
+  const result = await fetchSchema({ schema, params, baseURL: appBaseUrl });
+  return result;
 }
 
-function getIsAppReady(appBaseUrl: string) {
+async function getIsAppReady(appBaseUrl: string): Promise<unknown> {
   console.log("[API] getIsAppReady");
   const schema = opengeodeweb_front_schemas.api.microservice.app.get_is_app_ready;
-  return fetchSchema({ schema, baseURL: appBaseUrl });
+  const result = await fetchSchema({ schema, baseURL: appBaseUrl });
+  return result;
 }
 
 export { getIsAppReady, setAppBaseUrl, setBackBaseUrl, setIsAppReady, setViewerBaseUrl };
diff --git a/shared/utils/call_raw.ts b/shared/utils/call_raw.ts
index 75c79cdf..42eb32a0 100644
--- a/shared/utils/call_raw.ts
+++ b/shared/utils/call_raw.ts
@@ -6,35 +6,51 @@ import pTimeout from "p-timeout";
 import type { RequestHandlers } from "./types.js";
 
 interface RpcSession {
-  call: (rpc: string, params: [Record<string, unknown>]) => Promise<unknown>;
+  readonly call: (
+    rpc: string,
+    params: readonly [Readonly<Record<string, unknown>>],
+  ) => Promise<unknown>;
 }
 interface RpcConnection {
-  getSession: () => RpcSession;
+  readonly getSession: () => RpcSession;
 }
 interface RpcClient {
-  call: (rpc: string, params: Record<string, unknown>) => Promise<unknown>;
-  getConnection: () => RpcConnection;
+  readonly call: (rpc: string, params: Readonly<Record<string, unknown>>) => Promise<unknown>;
+  readonly getConnection: () => RpcConnection;
 }
 
-interface CallRawOptions {
+interface CallClientOptions {
   rpc: string;
-  params?: Record<string, unknown>;
-  client: RpcClient;
+  params?: Readonly<Record<string, unknown>>;
+  client: Readonly<RpcClient>;
+}
+
+interface CallRawOptions extends CallClientOptions {
   timeout?: number;
 }
 
-function callClient({ rpc, params = {}, client }: Omit<CallRawOptions, "timeout">) {
+async function callClient({
+  rpc,
+  params = {},
+  client,
+}: Readonly<CallClientOptions>): Promise<unknown> {
   if (globalThis.window !== undefined) {
-    return client.getConnection().getSession().call(rpc, [params]);
+    const response = await client.getConnection().getSession().call(rpc, [params]);
+    return response;
   }
-  return client.call(rpc, params);
+  const response = await client.call(rpc, params);
+  return response;
 }
 
-function callRaw(
-  { rpc, params = {}, client, timeout }: CallRawOptions,
-  { request_error_function, response_function, response_error_function }: RequestHandlers = {},
-) {
-  async function performCall() {
+async function callRaw(
+  { rpc, params = {}, client, timeout }: Readonly<CallRawOptions>,
+  {
+    request_error_function,
+    response_function,
+    response_error_function,
+  }: Readonly<RequestHandlers> = {},
+): Promise<unknown> {
+  async function performCall(): Promise<unknown> {
     try {
       const response = await callClient({ rpc, params, client });
       if (response_function) {
@@ -52,14 +68,16 @@ function callRaw(
     }
   }
 
-  if (timeout && timeout > 0) {
-    return pTimeout(performCall(), {
+  if (timeout !== undefined && timeout > 0) {
+    const result = await pTimeout(performCall(), {
       milliseconds: timeout,
       message: `${rpc}: Timed out after ${timeout}ms`,
     });
+    return result;
   }
 
-  return performCall();
+  const result = await performCall();
+  return result;
 }
 
 export { callRaw };
diff --git a/shared/utils/call_schema.ts b/shared/utils/call_schema.ts
index 987cdb0f..67b44af8 100644
--- a/shared/utils/call_schema.ts
+++ b/shared/utils/call_schema.ts
@@ -1,32 +1,28 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 // Third party imports
 
 // Local imports
-import { callRaw } from "./call_raw.js";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { RpcClient } from "./call_raw.js";
 import type { JsonRpcSchema, RequestHandlersWithValidation } from "./types.js";
+import { type RpcClient, callRaw } from "./call_raw.js";
 import { validateSchema } from "./validate_schema.js";
 
 const ERROR_400 = 400;
 
 interface CallSchemaOptions {
-  schema: JsonRpcSchema;
-  params?: Record<string, unknown>;
-  client: RpcClient;
+  schema: Readonly<JsonRpcSchema>;
+  params?: Readonly<Record<string, unknown>>;
+  client: Readonly<RpcClient>;
   timeout?: number;
 }
 
-function callSchema(
-  { schema, params = {}, client, timeout }: CallSchemaOptions,
+async function callSchema(
+  { schema, params = {}, client, timeout }: Readonly<CallSchemaOptions>,
   {
     request_error_function,
     response_function,
     response_error_function,
     validation_error_function,
-  }: RequestHandlersWithValidation = {},
-) {
+  }: Readonly<RequestHandlersWithValidation> = {},
+): Promise<unknown> {
   const { valid, error: schema_error } = validateSchema(schema, params);
 
   if (!valid) {
@@ -39,7 +35,7 @@ function callSchema(
     throw new Error(`${schema.$id}: ${schema_error}`);
   }
 
-  return callRaw(
+  const result = await callRaw(
     {
       rpc: schema.$id,
       params,
@@ -52,6 +48,7 @@ function callSchema(
       response_error_function,
     },
   );
+  return result;
 }
 
 export { callSchema };
diff --git a/shared/utils/fetch_raw.ts b/shared/utils/fetch_raw.ts
index d1530414..9421ba42 100644
--- a/shared/utils/fetch_raw.ts
+++ b/shared/utils/fetch_raw.ts
@@ -1,26 +1,88 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
 // Third party imports
 import { $fetch } from "ofetch";
 import _ from "lodash";
 import pTimeout from "p-timeout";
 
 // Local imports
-import { hasBody } from "./file.js";
 import type { RequestHandlers } from "./types.js";
+import { hasBody } from "./file.js";
 
 interface FetchRawOptions {
   route: string;
   method?: string;
   params?: unknown;
   baseURL?: string;
-  headers?: Record<string, string>;
+  headers?: Readonly<Record<string, string>>;
   max_retry?: number;
   timeout?: number;
   expectEvent?: boolean;
 }
 
-function fetchRaw(
+function resolveHeaders(
+  headers: Readonly<Record<string, string>>,
+  expectEvent: boolean,
+): Record<string, string> {
+  const resolvedHeaders: Record<string, string> = { ...headers };
+  if (expectEvent) {
+    const value = "text/event-stream";
+    if (_.isEmpty(resolvedHeaders)) {
+      resolvedHeaders.Accept = value;
+    } else {
+      resolvedHeaders.Accept = `${resolvedHeaders.Accept}, ${value}`;
+    }
+  }
+  return resolvedHeaders;
+}
+
+interface PerformFetchOptions extends RequestHandlers {
+  route: string;
+  method?: string;
+  params?: unknown;
+  baseURL?: string;
+  headers: Readonly<Record<string, string>>;
+  max_retry?: number;
+}
+
+async function performFetch({
+  route,
+  method,
+  params,
+  baseURL,
+  headers,
+  max_retry,
+  request_error_function,
+  response_function,
+  response_error_function,
+}: Readonly<PerformFetchOptions>): Promise<unknown> {
+  const fetchResult = await $fetch<unknown>(route, {
+    baseURL,
+    method,
+    headers,
+    ...(hasBody(params) ? { body: params } : {}),
+    ...(max_retry === undefined ? {} : { retry: max_retry }),
+    onRequestError({ error }: Readonly<{ error: unknown }>) {
+      if (request_error_function) {
+        request_error_function(error);
+      }
+    },
+    onResponse({
+      response,
+      // oxlint-disable-next-line eslint/id-length -- mirrors the real ofetch/vitest API field name (`ok`/`fn`)
+    }: Readonly<{ response: Readonly<{ ok: boolean; _data?: unknown }> }>) {
+      if (response.ok && response_function) {
+        response_function(response._data);
+      }
+    },
+    onResponseError({ response }: Readonly<{ response: unknown }>) {
+      if (response_error_function) {
+        response_error_function(response);
+      }
+    },
+  });
+  return fetchResult;
+}
+
+async function fetchRaw(
   {
     route,
     method,
@@ -30,56 +92,34 @@ function fetchRaw(
     max_retry,
     timeout,
     expectEvent = false,
-  }: FetchRawOptions,
-  { request_error_function, response_function, response_error_function }: RequestHandlers = {},
-) {
-  if (expectEvent) {
-    const value = "text/event-stream";
-    if (_.isEmpty(headers)) {
-      headers["Accept"] = value;
-    } else {
-      headers["Accept"] = `${headers["Accept"]}, ${value}`;
-    }
-  }
-
-  const request_options: Record<string, unknown> = { method, headers };
-  if (hasBody(params)) {
-    request_options.body = params;
-  }
-  if (max_retry) {
-    request_options.max_retry = max_retry;
-  }
-
-  function doFetch() {
-    return $fetch(route, {
-      baseURL,
-      ...request_options,
-      onRequestError({ error }: { error: unknown }) {
-        if (request_error_function) {
-          request_error_function(error);
-        }
-      },
-      // oxlint-disable-next-line eslint/id-length -- mirrors the real ofetch/vitest API field name (`ok`/`fn`)
-      onResponse({ response }: { response: { ok: boolean; _data: unknown } }) {
-        if (response.ok && response_function) {
-          response_function(response._data);
-        }
-      },
-      onResponseError({ response }: { response: unknown }) {
-        if (response_error_function) {
-          response_error_function(response);
-        }
-      },
-    } as Parameters<typeof $fetch>[1]);
-  }
+  }: Readonly<FetchRawOptions>,
+  {
+    request_error_function,
+    response_function,
+    response_error_function,
+  }: Readonly<RequestHandlers> = {},
+): Promise<unknown> {
+  const fetchOptions: Readonly<PerformFetchOptions> = {
+    route,
+    method,
+    params,
+    baseURL,
+    headers: resolveHeaders(headers, expectEvent),
+    max_retry,
+    request_error_function,
+    response_function,
+    response_error_function,
+  };
 
-  if (timeout && timeout > 0) {
-    return pTimeout(doFetch(), {
+  if (timeout !== undefined && timeout > 0) {
+    const result = await pTimeout(performFetch(fetchOptions), {
       milliseconds: timeout,
       message: `${route}: Timed out after ${timeout}ms`,
     });
+    return result;
   }
-  return doFetch();
+  const result = await performFetch(fetchOptions);
+  return result;
 }
 
 export { fetchRaw };
diff --git a/shared/utils/fetch_schema.ts b/shared/utils/fetch_schema.ts
index e670ef4c..b5d8e39a 100644
--- a/shared/utils/fetch_schema.ts
+++ b/shared/utils/fetch_schema.ts
@@ -1,32 +1,35 @@
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// Third party imports
-
 // Local imports
-import { fetchRaw } from "./fetch_raw.js";
 import type { JsonRpcSchema, RequestHandlersWithValidation } from "./types.js";
+import { fetchRaw } from "./fetch_raw.js";
 import { validateSchema } from "./validate_schema.js";
 
 const ERROR_400 = 400;
 
 interface FetchSchemaOptions {
-  schema: JsonRpcSchema & { methods: string[] };
+  schema: Readonly<JsonRpcSchema & { methods: readonly string[] }>;
   params?: unknown;
   baseURL?: string;
-  headers?: Record<string, string>;
+  headers?: Readonly<Record<string, string>>;
   timeout?: number;
   expectEvent?: boolean;
 }
 
-function fetchSchema(
-  { schema, params = {}, baseURL, headers, timeout, expectEvent = false }: FetchSchemaOptions,
+async function fetchSchema(
+  {
+    schema,
+    params = {},
+    baseURL,
+    headers,
+    timeout,
+    expectEvent = false,
+  }: Readonly<FetchSchemaOptions>,
   {
     request_error_function,
     response_function,
     response_error_function,
     validation_error_function,
-  }: RequestHandlersWithValidation = {},
-) {
+  }: Readonly<RequestHandlersWithValidation> = {},
+): Promise<unknown> {
   const { valid, error: schema_error } = validateSchema(schema, params);
 
   if (!valid) {
@@ -39,7 +42,7 @@ function fetchSchema(
     throw new Error(`${schema.$id}: ${schema_error}`);
   }
 
-  return fetchRaw(
+  const result = await fetchRaw(
     {
       route: schema.$id,
       method: schema.methods.find((method) => method !== "OPTIONS"),
@@ -56,6 +59,7 @@ function fetchSchema(
       response_error_function,
     },
   );
+  return result;
 }
 
 export { fetchSchema };
diff --git a/shared/utils/file.ts b/shared/utils/file.ts
index 3d39a18b..fbfefa94 100644
--- a/shared/utils/file.ts
+++ b/shared/utils/file.ts
@@ -7,7 +7,7 @@ function assertFile(file: unknown): asserts file is File {
   }
 }
 
-function hasBody(params: unknown): boolean {
+function hasBody(params: unknown): params is Blob | FormData | Record<string, unknown> {
   if (params instanceof FormData || params instanceof Blob) {
     return true;
   }
diff --git a/shared/utils/response_handlers/load.ts b/shared/utils/response_handlers/load.ts
index 06278fad..7c7b9f39 100644
--- a/shared/utils/response_handlers/load.ts
+++ b/shared/utils/response_handlers/load.ts
@@ -1,8 +1,8 @@
 interface AllowedObject {
-  is_loadable: number;
-  object_priority?: number;
+  readonly is_loadable: number;
+  readonly object_priority?: number;
 }
-type AllowedObjectMap = Record<string, AllowedObject>;
+type AllowedObjectMap = Readonly<Record<string, AllowedObject>>;
 
 function getFileExtension(filename: string): string {
   return filename.slice(filename.lastIndexOf(".") + 1);
@@ -21,8 +21,13 @@ function selectGeodeObject(objectMap: AllowedObjectMap): string | undefined {
   if (objectKeys.length === 0) {
     return undefined;
   }
-  if (objectKeys.length === 1 && getObject(objectMap, objectKeys[0]!).is_loadable > 0) {
-    return objectKeys[0];
+  const [firstKey] = objectKeys;
+  if (
+    objectKeys.length === 1 &&
+    firstKey !== undefined &&
+    getObject(objectMap, firstKey).is_loadable > 0
+  ) {
+    return firstKey;
   }
 
   const highestLoadScore = Math.max(
@@ -52,7 +57,7 @@ function selectGeodeObject(objectMap: AllowedObjectMap): string | undefined {
   return undefined;
 }
 
-function intersectAllowedObjects(allowedObjectsList: AllowedObjectMap[]): {
+function intersectAllowedObjects(allowedObjectsList: readonly AllowedObjectMap[]): {
   commonKeys: string[];
   allKeys: string[];
   mergedAllowedObjects: AllowedObjectMap;
@@ -60,23 +65,33 @@ function intersectAllowedObjects(allowedObjectsList: AllowedObjectMap[]): {
   const allKeys = [...new Set(allowedObjectsList.flatMap((object) => Object.keys(object)))];
   const commonKeys = allKeys.filter((key) => allowedObjectsList.every((object) => key in object));
 
-  const mergedAllowedObjects: AllowedObjectMap = {};
-  for (const key of commonKeys) {
+  const mergedEntries = commonKeys.map((key): [string, AllowedObject] => {
     const loadScores = allowedObjectsList.map((object) => getObject(object, key).is_loadable);
     const priorities = allowedObjectsList
       .map((object) => getObject(object, key).object_priority)
       .filter((priority): priority is number => priority !== undefined);
 
-    mergedAllowedObjects[key] = { is_loadable: Math.min(...loadScores) };
     if (priorities.length > 0) {
-      mergedAllowedObjects[key].object_priority = Math.max(...priorities);
+      return [
+        key,
+        { is_loadable: Math.min(...loadScores), object_priority: Math.max(...priorities) },
+      ];
     }
-  }
+    return [key, { is_loadable: Math.min(...loadScores) }];
+  });
+  const mergedAllowedObjects: AllowedObjectMap = Object.fromEntries(mergedEntries);
 
   return { commonKeys, allKeys, mergedAllowedObjects };
 }
 
-function resolveAllowedObjects(filenames: string[], allowedObjectsList: AllowedObjectMap[]) {
+function resolveAllowedObjects(
+  filenames: readonly string[],
+  allowedObjectsList: readonly AllowedObjectMap[],
+): {
+  mergedAllowedObjects: AllowedObjectMap;
+  multipleFilesNoCommon: boolean;
+  selectedGeodeObject: string | undefined;
+} {
   const { commonKeys, allKeys, mergedAllowedObjects } = intersectAllowedObjects(allowedObjectsList);
 
   const multipleFilesNoCommon =
diff --git a/shared/utils/types.ts b/shared/utils/types.ts
index c2a4f253..6a90cc40 100644
--- a/shared/utils/types.ts
+++ b/shared/utils/types.ts
@@ -1,10 +1,10 @@
 // Covers both flavors of schema used across this codebase: HTTP ("front") schemas carry a `methods` array, websocket RPC ("viewer"/"back") schemas carry `rpc` instead. Neither field is required here since call sites that need one specifically (e.g. fetchSchema needing `methods`) narrow it themselves.
 interface JsonRpcSchema {
-  $id: string;
-  methods?: string[];
-  rpc?: string;
-  max_retry?: number;
-  [key: string]: unknown;
+  readonly $id: string;
+  readonly methods?: readonly string[];
+  readonly rpc?: string;
+  readonly max_retry?: number;
+  readonly [key: string]: unknown;
 }
 
 interface ValidationError {
@@ -14,14 +14,14 @@ interface ValidationError {
 }
 
 interface RequestHandlers {
-  request_error_function?: (error: unknown) => void;
+  readonly request_error_function?: (error: unknown) => void;
   // Return value is intentionally untyped: callers commonly return the Promise of a downstream call (e.g. a Dexie `.put()`, which resolves to a primary key) that this code chains/awaits but never inspects the resolved value of.
-  response_function?: (response: unknown) => unknown;
-  response_error_function?: (response: unknown) => void;
+  readonly response_function?: (response: unknown) => unknown;
+  readonly response_error_function?: (response: unknown) => void;
 }
 
 interface RequestHandlersWithValidation extends RequestHandlers {
-  validation_error_function?: (error: ValidationError) => void;
+  readonly validation_error_function?: (error: Readonly<ValidationError>) => void;
 }
 
 export type { JsonRpcSchema, RequestHandlers, RequestHandlersWithValidation, ValidationError };
diff --git a/shared/utils/validate_schema.ts b/shared/utils/validate_schema.ts
index e3bc9c4a..8777ca80 100644
--- a/shared/utils/validate_schema.ts
+++ b/shared/utils/validate_schema.ts
@@ -2,13 +2,16 @@ import Ajv from "ajv";
 
 import type { JsonRpcSchema } from "./types.js";
 
-function validateSchema(schema: JsonRpcSchema, body: unknown): { valid: boolean; error: string } {
+function validateSchema(
+  schema: Readonly<JsonRpcSchema>,
+  body: unknown,
+): { valid: boolean; error: string } {
   const ajv = new Ajv();
   const list_keywords = ["methods", "route", "max_retry", "rpc"];
   for (const keyword of list_keywords) {
     ajv.addKeyword(keyword);
   }
-  const valid = Boolean(ajv.validate(schema, body));
+  const valid = ajv.validate(schema, body);
   return { valid, error: ajv.errorsText() };
 }
 
diff --git a/tests/integration/setup.ts b/tests/integration/setup.ts
index 5e09deeb..2781f75a 100644
--- a/tests/integration/setup.ts
+++ b/tests/integration/setup.ts
@@ -22,14 +22,14 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 const beforeAllTimeout = 40_000;
 const data_folder = path.join("tests", "integration", "data", "uploads");
 
-async function runMicroservices() {
+async function runMicroservices(): Promise<{ projectFolderPath: string }> {
   const backStore = useBackStore();
   const infraStore = useInfraStore();
   const viewerStore = useViewerStore();
   infraStore.app_mode = appMode.BROWSER;
   const { COMMAND_BACK, PROJECT, COMMAND_VIEWER, NUXT_ROOT_PATH } = useRuntimeConfig().public;
   const projectFolderPath = generateProjectFolderPath(PROJECT);
-  await createPath(projectFolderPath);
+  createPath(projectFolderPath);
 
   const [back_port, viewer_port] = await Promise.all([
     runBack(COMMAND_BACK, NUXT_ROOT_PATH, {
@@ -46,12 +46,12 @@ async function runMicroservices() {
     throw new Error("Failed to start microservices: back_port or viewer_port is undefined");
   }
 
-  await addMicroserviceMetadatas(projectFolderPath, {
+  addMicroserviceMetadatas(projectFolderPath, {
     type: "back",
     name: COMMAND_BACK,
     port: back_port,
   });
-  await addMicroserviceMetadatas(projectFolderPath, {
+  addMicroserviceMetadatas(projectFolderPath, {
     type: "viewer",
     name: COMMAND_VIEWER,
     port: viewer_port,
@@ -65,7 +65,10 @@ async function runMicroservices() {
   };
 }
 
-async function setupIntegrationTests(file_name: string, geode_object: string) {
+async function setupIntegrationTests(
+  file_name: string,
+  geode_object: string,
+): Promise<{ id: string; projectFolderPath: string }> {
   setupActivePinia();
   const viewerStore = useViewerStore();
   const { projectFolderPath } = await runMicroservices();
@@ -76,16 +79,21 @@ async function setupIntegrationTests(file_name: string, geode_object: string) {
   return { id, projectFolderPath };
 }
 
-const mockLockRequest = vi.fn().mockImplementation(async (name, task) => await task({ name }));
+const mockLockRequest = vi
+  .fn()
+  .mockImplementation(async (name: string, task: (lock: { name: string }) => Promise<unknown>) => {
+    const result = await task({ name });
+    return result;
+  });
 
-vi.stubGlobal("navigator", {
-  ...navigator,
-  locks: {
-    request: mockLockRequest,
-  },
+Object.defineProperty(navigator, "locks", {
+  value: { request: mockLockRequest },
+  configurable: true,
 });
+vi.stubGlobal("navigator", navigator);
 
 beforeAll(() => {
+  // oxlint-disable-next-line no-unsafe-type-assertion -- Node's "ws" WebSocket is used as a browser WebSocket polyfill in tests.
   globalThis.WebSocket = WebSocket as unknown as typeof globalThis.WebSocket;
 });
 
diff --git a/tests/integration/stores/data_style/mesh/cells.nuxt.test.ts b/tests/integration/stores/data_style/mesh/cells.nuxt.test.ts
index c7f557a2..dde888a1 100644
--- a/tests/integration/stores/data_style/mesh/cells.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/cells.nuxt.test.ts
@@ -53,6 +53,7 @@ describe("mesh cells", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -75,6 +76,7 @@ describe("mesh cells", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -116,6 +118,7 @@ describe("mesh cells", () => {
       const item = dataStyleStore.meshCellsVertexAttributeItem(id);
       expect(spy).toHaveBeenCalledWith({
         schema,
+        // oxlint-disable-next-line no-unsafe-assignment -- expect.objectContaining is untyped by design, this is a vitest matcher not a plain object.
         params: expect.objectContaining({ id, name, item, minimum: range[0], maximum: range[1] }),
       });
       expect(dataStyleStore.meshCellsVertexAttributeRange(id)).toStrictEqual(range);
@@ -135,8 +138,8 @@ describe("mesh cells", () => {
         maximum: MAXIMUM_RANGE,
         colorMap: "batlow",
       });
-      dataStyleStore.setMeshCellsVertexAttributeColorMap(id, "oleron");
-      dataStyleStore.setMeshCellsVertexAttributeRange(id, MINIMUM_RANGE, ALTERNATE_RANGE_MAX);
+      await dataStyleStore.setMeshCellsVertexAttributeColorMap(id, "oleron");
+      await dataStyleStore.setMeshCellsVertexAttributeRange(id, MINIMUM_RANGE, ALTERNATE_RANGE_MAX);
       await dataStyleStore.setMeshCellsVertexAttribute(id, {
         name: "points",
         item: 0,
@@ -145,7 +148,7 @@ describe("mesh cells", () => {
         colorMap: "oleron",
       });
 
-      dataStyleStore.setMeshCellsVertexAttributeItem(id, 1);
+      await dataStyleStore.setMeshCellsVertexAttributeItem(id, 1);
       await dataStyleStore.setMeshCellsVertexAttribute(id, {
         name: "points",
         item: 1,
@@ -157,6 +160,7 @@ describe("mesh cells", () => {
       expect(dataStyleStore.meshCellsVertexAttributeRange(id)).toStrictEqual([0, MAXIMUM_RANGE]);
       expect(spy).toHaveBeenCalledWith({
         schema,
+        // oxlint-disable-next-line no-unsafe-assignment -- expect.objectContaining is untyped by design, this is a vitest matcher not a plain object.
         params: expect.objectContaining({
           id,
           name: "points",
@@ -169,7 +173,7 @@ describe("mesh cells", () => {
 
     test("stored configs - restore previous item config", async () => {
       const dataStyleStore = useDataStyleStore();
-      dataStyleStore.setMeshCellsVertexAttributeItem(id, 0);
+      await dataStyleStore.setMeshCellsVertexAttributeItem(id, 0);
       const storedConfig0 = dataStyleStore.meshCellsVertexAttributeStoredConfig(id, "points", 0);
       await dataStyleStore.setMeshCellsVertexAttribute(id, {
         name: "points",
diff --git a/tests/integration/stores/data_style/mesh/edges.nuxt.test.ts b/tests/integration/stores/data_style/mesh/edges.nuxt.test.ts
index c5eb049b..dd29b8e7 100644
--- a/tests/integration/stores/data_style/mesh/edges.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/edges.nuxt.test.ts
@@ -48,6 +48,7 @@ describe("mesh edges", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -68,6 +69,7 @@ describe("mesh edges", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/mesh/index.nuxt.test.ts b/tests/integration/stores/data_style/mesh/index.nuxt.test.ts
index 1c1c1320..5a10c3a6 100644
--- a/tests/integration/stores/data_style/mesh/index.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/index.nuxt.test.ts
@@ -41,6 +41,7 @@ describe("mesh", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/mesh/points.nuxt.test.ts b/tests/integration/stores/data_style/mesh/points.nuxt.test.ts
index d45c6ab9..cd1e4eb4 100644
--- a/tests/integration/stores/data_style/mesh/points.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/points.nuxt.test.ts
@@ -47,6 +47,7 @@ describe("mesh points", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -69,6 +70,7 @@ describe("mesh points", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -116,6 +118,7 @@ describe("mesh points", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.ts b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.ts
index 9173adce..c207dd00 100644
--- a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.ts
@@ -48,6 +48,7 @@ describe("mesh polygons", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -70,6 +71,7 @@ describe("mesh polygons", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.ts b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.ts
index 14c0f8d3..e7099057 100644
--- a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.ts
+++ b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.ts
@@ -48,6 +48,7 @@ describe("mesh polyhedra", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -68,6 +69,7 @@ describe("mesh polyhedra", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/model/blocks.nuxt.test.ts b/tests/integration/stores/data_style/model/blocks.nuxt.test.ts
index 21b9e4a0..9a0b8e2d 100644
--- a/tests/integration/stores/data_style/model/blocks.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/blocks.nuxt.test.ts
@@ -7,6 +7,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 import { Status } from "@ogw_front/utils/status";
+import { assertDefined } from "@ogw_tests/utils";
 import { cleanupBackend } from "@ogw_server/utils/cleanup";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -20,9 +21,9 @@ const SLEEP_MS = 200;
 const MINIMUM_RANGE = 10;
 const MAXIMUM_RANGE = 20;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -59,6 +60,7 @@ describe("model blocks", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -85,6 +87,7 @@ describe("model blocks", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -129,10 +132,9 @@ describe("model blocks", () => {
       );
       await dataStyleStore.setModelBlocksVertexAttributeColorMap(id, block_ids, "budaS");
       await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_blocks_schemas.attribute.vertex.attribute);
-      expect(lastCall![0].params).toStrictEqual(
+      const lastCall = assertDefined(spy.mock.calls.at(-1));
+      expect(lastCall[0].schema).toStrictEqual(model_blocks_schemas.attribute.vertex.attribute);
+      expect(lastCall[0].params).toStrictEqual(
         expect.objectContaining({
           id,
           block_ids: block_viewer_ids,
@@ -150,7 +152,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksVertexAttributeName(id, block_ids, "points");
       await dataStyleStore.setModelBlocksVertexAttributeItem(id, block_ids, 2);
       expect(dataStyleStore.modelBlocksVertexAttributeName(id, block_id)).toBe("points");
@@ -161,7 +163,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksVertexAttributeRange(
         id,
         block_ids,
@@ -181,7 +183,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksVertexAttributeName(id, block_ids, "unique_vertices");
       await dataStyleStore.setModelBlocksVertexAttributeItem(id, block_ids, 0);
       expect(dataStyleStore.modelBlocksVertexAttributeName(id, block_id)).toBe("unique_vertices");
@@ -192,7 +194,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksVertexAttributeName(id, block_ids, "points");
       expect(dataStyleStore.modelBlocksVertexAttributeName(id, block_id)).toBe("points");
       expect(dataStyleStore.modelBlocksVertexAttributeItem(id, block_id)).toBe(2);
@@ -247,12 +249,9 @@ describe("model blocks", () => {
       );
       await dataStyleStore.setModelBlocksPolyhedronAttributeColorMap(id, block_ids, "budaS");
       await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(
-        model_blocks_schemas.attribute.polyhedron.attribute,
-      );
-      expect(lastCall![0].params).toStrictEqual(
+      const lastCall = assertDefined(spy.mock.calls.at(-1));
+      expect(lastCall[0].schema).toStrictEqual(model_blocks_schemas.attribute.polyhedron.attribute);
+      expect(lastCall[0].params).toStrictEqual(
         expect.objectContaining({
           id,
           block_ids: block_viewer_ids,
@@ -270,7 +269,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksPolyhedronAttributeName(
         id,
         block_ids,
@@ -287,7 +286,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksPolyhedronAttributeRange(
         id,
         block_ids,
@@ -307,7 +306,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksPolyhedronAttributeName(
         id,
         block_ids,
@@ -324,7 +323,7 @@ describe("model blocks", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksPolyhedronAttributeName(
         id,
         block_ids,
@@ -359,7 +358,7 @@ describe("model blocks", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       const coloringName = "constant";
       const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
@@ -373,7 +372,7 @@ describe("model blocks", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksVertexAttributeName(id, [block_id], "points");
       const coloringName = "vertex";
       const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
@@ -388,7 +387,7 @@ describe("model blocks", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
-      const block_id = block_ids[0]!;
+      const block_id = assertDefined(block_ids[0]);
       await dataStyleStore.setModelBlocksPolyhedronAttributeName(id, [block_id], "test_attribute");
       const coloringName = "polyhedron";
       const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
diff --git a/tests/integration/stores/data_style/model/corners.nuxt.test.ts b/tests/integration/stores/data_style/model/corners.nuxt.test.ts
index 307e46c5..58b52079 100644
--- a/tests/integration/stores/data_style/model/corners.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/corners.nuxt.test.ts
@@ -6,6 +6,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 import { Status } from "@ogw_front/utils/status";
+import { assertDefined } from "@ogw_tests/utils";
 import { cleanupBackend } from "@ogw_server/utils/cleanup";
 import { isModelCornersVertexAttributeValid } from "@ogw_internal/stores/data_style/model/corners/vertex";
 import { useDataStore } from "@ogw_front/stores/data";
@@ -20,9 +21,9 @@ const SLEEP_MS = 200;
 const MINIMUM_RANGE = 10;
 const MAXIMUM_RANGE = 20;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -59,6 +60,7 @@ describe("model corners", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -88,6 +90,7 @@ describe("model corners", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -146,10 +149,9 @@ describe("model corners", () => {
       );
       await dataStyleStore.setModelCornersVertexAttributeColorMap(id, corner_ids, "budaS");
       await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_corners_schemas.attribute.vertex.attribute);
-      expect(lastCall![0].params).toStrictEqual(
+      const lastCall = assertDefined(spy.mock.calls.at(-1));
+      expect(lastCall[0].schema).toStrictEqual(model_corners_schemas.attribute.vertex.attribute);
+      expect(lastCall[0].params).toStrictEqual(
         expect.objectContaining({
           id,
           block_ids: corner_viewer_ids,
@@ -167,7 +169,7 @@ describe("model corners", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       await dataStyleStore.setModelCornersVertexAttributeName(id, corner_ids, "points");
       await dataStyleStore.setModelCornersVertexAttributeItem(id, corner_ids, 2);
       expect(dataStyleStore.modelCornersVertexAttributeName(id, corner_id)).toBe("points");
@@ -178,7 +180,7 @@ describe("model corners", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       await dataStyleStore.setModelCornersVertexAttributeRange(
         id,
         corner_ids,
@@ -198,7 +200,7 @@ describe("model corners", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       await dataStyleStore.setModelCornersVertexAttributeName(id, corner_ids, "unique_vertices");
       await dataStyleStore.setModelCornersVertexAttributeItem(id, corner_ids, 0);
       expect(dataStyleStore.modelCornersVertexAttributeName(id, corner_id)).toBe("unique_vertices");
@@ -209,7 +211,7 @@ describe("model corners", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       await dataStyleStore.setModelCornersVertexAttributeName(id, corner_ids, "points");
       expect(dataStyleStore.modelCornersVertexAttributeName(id, corner_id)).toBe("points");
       expect(dataStyleStore.modelCornersVertexAttributeItem(id, corner_id)).toBe(2);
@@ -238,7 +240,7 @@ describe("model corners", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       const coloringName = "constant";
       const result = dataStyleStore.setModelComponentActiveColoring(id, corner_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
@@ -252,7 +254,7 @@ describe("model corners", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
-      const corner_id = corner_ids[0]!;
+      const corner_id = assertDefined(corner_ids[0]);
       await dataStyleStore.setModelCornersVertexAttributeName(id, [corner_id], "points");
       const coloringName = "vertex";
       const result = dataStyleStore.setModelComponentActiveColoring(id, corner_id, coloringName);
diff --git a/tests/integration/stores/data_style/model/edges.nuxt.test.ts b/tests/integration/stores/data_style/model/edges.nuxt.test.ts
index 7b2af605..912527bc 100644
--- a/tests/integration/stores/data_style/model/edges.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/edges.nuxt.test.ts
@@ -15,9 +15,9 @@ const file_name = "test.og_brep";
 const geode_object = "BRep";
 const SLEEP_MS = 200;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -51,6 +51,7 @@ describe("model edges", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/model/index.nuxt.test.ts b/tests/integration/stores/data_style/model/index.nuxt.test.ts
index e7be481a..7b0b32d8 100644
--- a/tests/integration/stores/data_style/model/index.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/index.nuxt.test.ts
@@ -5,6 +5,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 // Local imports
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
+import { assertDefined } from "@ogw_tests/utils";
 import { cleanupBackend } from "@ogw_server/utils/cleanup";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -16,9 +17,9 @@ const file_name = "test.og_brep";
 const geode_object = "BRep";
 const SLEEP_MS = 200;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -52,6 +53,7 @@ describe("model", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -66,7 +68,7 @@ describe("model", () => {
       const dataStore = useDataStore();
 
       const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
+      const surface_id = assertDefined(surface_ids[0]);
 
       const red = { red: 255, green: 0, blue: 0, alpha: 1 };
       const green = { red: 0, green: 255, blue: 0, alpha: 1 };
diff --git a/tests/integration/stores/data_style/model/lines.nuxt.test.ts b/tests/integration/stores/data_style/model/lines.nuxt.test.ts
index bc03da7a..1ca6ce3b 100644
--- a/tests/integration/stores/data_style/model/lines.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/lines.nuxt.test.ts
@@ -7,6 +7,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 import { Status } from "@ogw_front/utils/status";
+import { assertDefined } from "@ogw_tests/utils";
 import { cleanupBackend } from "@ogw_server/utils/cleanup";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -20,9 +21,9 @@ const SLEEP_MS = 200;
 const MINIMUM_RANGE = 10;
 const MAXIMUM_RANGE = 20;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -60,6 +61,7 @@ describe("model lines", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -89,6 +91,7 @@ describe("model lines", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -135,10 +138,9 @@ describe("model lines", () => {
       );
       await dataStyleStore.setModelLinesVertexAttributeColorMap(id, line_ids, "budaS");
       await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_lines_schemas.attribute.vertex.attribute);
-      expect(lastCall![0].params).toStrictEqual(
+      const lastCall = assertDefined(spy.mock.calls.at(-1));
+      expect(lastCall[0].schema).toStrictEqual(model_lines_schemas.attribute.vertex.attribute);
+      expect(lastCall[0].params).toStrictEqual(
         expect.objectContaining({
           id,
           block_ids: lines_viewer_ids,
@@ -156,7 +158,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesVertexAttributeName(id, line_ids, "points");
       await dataStyleStore.setModelLinesVertexAttributeItem(id, line_ids, 2);
       expect(dataStyleStore.modelLinesVertexAttributeName(id, line_id)).toBe("points");
@@ -167,7 +169,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesVertexAttributeRange(
         id,
         line_ids,
@@ -187,7 +189,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesVertexAttributeName(id, line_ids, "unique_vertices");
       await dataStyleStore.setModelLinesVertexAttributeItem(id, line_ids, 0);
       expect(dataStyleStore.modelLinesVertexAttributeName(id, line_id)).toBe("unique_vertices");
@@ -198,7 +200,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesVertexAttributeName(id, line_ids, "points");
       expect(dataStyleStore.modelLinesVertexAttributeName(id, line_id)).toBe("points");
       expect(dataStyleStore.modelLinesVertexAttributeItem(id, line_id)).toBe(2);
@@ -247,10 +249,9 @@ describe("model lines", () => {
       );
       await dataStyleStore.setModelLinesEdgeAttributeColorMap(id, line_ids, "budaS");
       await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_lines_schemas.attribute.edge.attribute);
-      expect(lastCall![0].params).toStrictEqual(
+      const lastCall = assertDefined(spy.mock.calls.at(-1));
+      expect(lastCall[0].schema).toStrictEqual(model_lines_schemas.attribute.edge.attribute);
+      expect(lastCall[0].params).toStrictEqual(
         expect.objectContaining({
           id,
           block_ids: lines_viewer_ids,
@@ -268,7 +269,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesEdgeAttributeName(id, line_ids, "edges");
       await dataStyleStore.setModelLinesEdgeAttributeItem(id, line_ids, 2);
       expect(dataStyleStore.modelLinesEdgeAttributeName(id, line_id)).toBe("edges");
@@ -279,7 +280,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesEdgeAttributeRange(
         id,
         line_ids,
@@ -299,7 +300,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesEdgeAttributeName(id, line_ids, "dummy_attribute");
       await dataStyleStore.setModelLinesEdgeAttributeItem(id, line_ids, 0);
       expect(dataStyleStore.modelLinesEdgeAttributeName(id, line_id)).toBe("dummy_attribute");
@@ -310,7 +311,7 @@ describe("model lines", () => {
       const dataStyleStore = useDataStyleStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesEdgeAttributeName(id, line_ids, "edges");
       expect(dataStyleStore.modelLinesEdgeAttributeName(id, line_id)).toBe("edges");
       expect(dataStyleStore.modelLinesEdgeAttributeItem(id, line_id)).toBe(2);
@@ -339,7 +340,7 @@ describe("model lines", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       const coloringName = "constant";
       const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
@@ -353,7 +354,7 @@ describe("model lines", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesVertexAttributeName(id, [line_id], "points");
       const coloringName = "vertex";
       const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
@@ -368,7 +369,7 @@ describe("model lines", () => {
       const viewerStore = useViewerStore();
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
-      const line_id = line_ids[0]!;
+      const line_id = assertDefined(line_ids[0]);
       await dataStyleStore.setModelLinesEdgeAttributeName(id, [line_id], "test_attribute");
       const coloringName = "edge";
       const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
diff --git a/tests/integration/stores/data_style/model/points.nuxt.test.ts b/tests/integration/stores/data_style/model/points.nuxt.test.ts
index e060583f..a1d16e21 100644
--- a/tests/integration/stores/data_style/model/points.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/points.nuxt.test.ts
@@ -15,9 +15,9 @@ const file_name = "test.og_brep";
 const geode_object = "BRep";
 const SLEEP_MS = 200;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
@@ -51,6 +51,7 @@ describe("model points", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
@@ -75,6 +76,7 @@ describe("model points", () => {
       expect(spy).toHaveBeenCalledWith(
         { schema, params },
         {
+          // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
           response_function: expect.any(Function),
         },
       );
diff --git a/tests/integration/stores/data_style/model/surfaces.nuxt.test.ts b/tests/integration/stores/data_style/model/surfaces.nuxt.test.ts
index 4c5ee2c5..e35a18aa 100644
--- a/tests/integration/stores/data_style/model/surfaces.nuxt.test.ts
+++ b/tests/integration/stores/data_style/model/surfaces.nuxt.test.ts
@@ -7,6 +7,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
 import { Status } from "@ogw_front/utils/status";
+import { assertDefined } from "@ogw_tests/utils";
 import { cleanupBackend } from "@ogw_server/utils/cleanup";
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
 import { isModelSurfacesPolygonAttributeValid } from "@ogw_internal/stores/data_style/model/surfaces/polygon";
@@ -23,14 +24,23 @@ const SLEEP_MS = 200;
 const MINIMUM_RANGE = 10;
 const MAXIMUM_RANGE = 20;
 const MAX_RANGE_TEST_VALUE = 100;
+const TEST_TIMEOUT_MS = 15_000;
 
-function sleep(milliseconds: number) {
+async function sleep(milliseconds: number): Promise<void> {
   // oxlint-disable-next-line promise/avoid-new
-  return new Promise((resolve) => {
+  await new Promise<void>((resolve) => {
     setTimeout(resolve, milliseconds);
   });
 }
 
+function firstElement<Item>(array: readonly Item[]): Item {
+  const [element] = array;
+  if (element === undefined) {
+    throw new Error("Expected array to contain at least one element");
+  }
+  return element;
+}
+
 let id = "";
 let projectFolderPath = "";
 
@@ -40,537 +50,642 @@ describe("model surfaces", () => {
   }, beforeAllTimeout);
 
   afterAll(async () => {
-    console.log("afterAll model surfaces kill", projectFolderPath);
     await cleanupBackend(projectFolderPath);
   });
   describe("surfaces visibility", () => {
-    test("visibility true", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const visibility = true;
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      const result = dataStyleStore.setModelSurfacesVisibility(id, surface_ids, visibility);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      await sleep(SLEEP_MS);
-      const schema = model_surfaces_schemas.visibility;
-      const params = { id, block_ids: surface_viewer_ids, visibility };
-      expect(spy).toHaveBeenCalledWith(
-        { schema, params },
-        {
-          response_function: expect.any(Function),
-        },
-      );
-      for (const surface_id of surface_ids) {
-        expect(dataStyleStore.modelSurfaceVisibility(id, surface_id)).toBe(visibility);
-      }
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
+    test(
+      "visibility true",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const visibility = true;
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        const result = dataStyleStore.setModelSurfacesVisibility(id, surface_ids, visibility);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        await sleep(SLEEP_MS);
+        const schema = model_surfaces_schemas.visibility;
+        const params = { id, block_ids: surface_viewer_ids, visibility };
+        expect(spy).toHaveBeenCalledWith(
+          { schema, params },
+          {
+            // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
+            response_function: expect.any(Function),
+          },
+        );
+        for (const surface_id of surface_ids) {
+          expect(dataStyleStore.modelSurfaceVisibility(id, surface_id)).toBe(visibility);
+        }
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
 
   describe("surfaces color", () => {
-    test("color red", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const color = { red: 255, green: 0, blue: 0, alpha: 1 };
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      const result = dataStyleStore.setModelSurfacesColor(id, surface_ids, color);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      await sleep(SLEEP_MS);
-      const schema = model_surfaces_schemas.color;
-      const params = { id, block_ids: surface_viewer_ids, color, color_mode: "constant" };
-      expect(spy).toHaveBeenCalledWith(
-        { schema, params },
-        {
-          response_function: expect.any(Function),
-        },
-      );
-      for (const surface_id of surface_ids) {
-        expect(dataStyleStore.modelSurfaceColor(id, surface_id)).toStrictEqual(color);
-      }
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
+    test(
+      "color red",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const color = { red: 255, green: 0, blue: 0, alpha: 1 };
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        const result = dataStyleStore.setModelSurfacesColor(id, surface_ids, color);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        await sleep(SLEEP_MS);
+        const schema = model_surfaces_schemas.color;
+        const params = { id, block_ids: surface_viewer_ids, color, color_mode: "constant" };
+        expect(spy).toHaveBeenCalledWith(
+          { schema, params },
+          {
+            // oxlint-disable-next-line no-unsafe-assignment -- expect.any(Function) is untyped by design, this is a vitest matcher not a real callback.
+            response_function: expect.any(Function),
+          },
+        );
+        for (const surface_id of surface_ids) {
+          expect(dataStyleStore.modelSurfaceColor(id, surface_id)).toStrictEqual(color);
+        }
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
   describe("surfaces vertex attribute", () => {
-    test("coloring vertex attribute", () => {
-      expect(
-        isModelSurfacesVertexAttributeValid({
+    test(
+      "coloring vertex attribute",
+      () => {
+        expect(
+          isModelSurfacesVertexAttributeValid({
+            name: "points",
+            item: 0,
+            minimum: undefined,
+            maximum: undefined,
+            colorMap: undefined,
+          }),
+        ).toBe(false);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring vertex attribute — direct set with full object",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        const vertex_attribute = {
           name: "points",
           item: 0,
-          minimum: undefined,
-          maximum: undefined,
-          colorMap: undefined,
-        }),
-      ).toBe(false);
-    });
-
-    test("coloring vertex attribute — direct set with full object", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      const vertex_attribute = {
-        name: "points",
-        item: 0,
-        minimum: MINIMUM_RANGE,
-        maximum: MAXIMUM_RANGE,
-        colorMap: "batlow",
-      };
-      const result = dataStyleStore.setModelSurfacesVertexAttribute(
-        id,
-        surface_ids,
-        vertex_attribute,
-      );
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      await sleep(SLEEP_MS);
-      const schema = model_surfaces_schemas.attribute.vertex.attribute;
-      const points = getRGBPointsFromPreset(vertex_attribute.colorMap);
-      const params = {
-        id,
-        block_ids: surface_viewer_ids,
-        name: vertex_attribute.name,
-        item: vertex_attribute.item,
-        points,
-        minimum: vertex_attribute.minimum,
-        maximum: vertex_attribute.maximum,
-        no_data_color: DEFAULT_NO_DATA_COLOR,
-      };
-      expect(spy).toHaveBeenCalledWith({ schema, params });
-      const surface_id = surface_ids[0]!;
-      expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe(
-        vertex_attribute.name,
-      );
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("coloring vertex attribute — item switching and stored configs restore", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-
-      await dataStyleStore.setModelSurfacesVertexAttribute(id, surface_ids, {
-        name: "points",
-        item: 0,
-        minimum: MINIMUM_RANGE,
-        maximum: MAXIMUM_RANGE,
-        colorMap: "batlow",
-      });
-
-      await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 1);
-      await dataStyleStore.setModelSurfacesVertexAttributeRange(
-        id,
-        surface_ids,
-        0,
-        MAX_RANGE_TEST_VALUE,
-      );
-      await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "berlin");
-      expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(1);
-      expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
-        0,
-        MAX_RANGE_TEST_VALUE,
-      ]);
-      expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("berlin");
-
-      await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 0);
-      expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(0);
-      expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      // oxlint-disable-next-line max-expects
-      expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("batlow");
-    });
-
-    test("coloring vertex attribute — request sent when all params defined", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
-      await dataStyleStore.setModelSurfacesVertexAttributeRange(
-        id,
-        surface_ids,
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      );
-      await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "budaS");
-      await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_surfaces_schemas.attribute.vertex.attribute);
-      expect(lastCall![0].params).toStrictEqual(
-        expect.objectContaining({
+          minimum: MINIMUM_RANGE,
+          maximum: MAXIMUM_RANGE,
+          colorMap: "batlow",
+        };
+        const result = dataStyleStore.setModelSurfacesVertexAttribute(
+          id,
+          surface_ids,
+          vertex_attribute,
+        );
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        await sleep(SLEEP_MS);
+        const schema = model_surfaces_schemas.attribute.vertex.attribute;
+        const points = getRGBPointsFromPreset(vertex_attribute.colorMap);
+        const params = {
           id,
           block_ids: surface_viewer_ids,
+          name: vertex_attribute.name,
+          item: vertex_attribute.item,
+          points,
+          minimum: vertex_attribute.minimum,
+          maximum: vertex_attribute.maximum,
+          no_data_color: DEFAULT_NO_DATA_COLOR,
+        };
+        expect(spy).toHaveBeenCalledWith({ schema, params });
+        const surface_id = firstElement(surface_ids);
+        expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe(
+          vertex_attribute.name,
+        );
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring vertex attribute — item switching and stored configs restore",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+
+        await dataStyleStore.setModelSurfacesVertexAttribute(id, surface_ids, {
           name: "points",
           item: 0,
           minimum: MINIMUM_RANGE,
           maximum: MAXIMUM_RANGE,
-        }),
-      );
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("stored configs 1 - select attribute points and item 2", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
-      await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 2);
-      expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe("points");
-      expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(2);
-    });
-
-    test("stored configs 2 - set range and colormap", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesVertexAttributeRange(
-        id,
-        surface_ids,
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      );
-      await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "budaS");
-      await sleep(SLEEP_MS);
-      expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("budaS");
-    });
-
-    test("stored configs 3 - select unique_vertices", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "unique_vertices");
-      await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 0);
-      expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe(
-        "unique_vertices",
-      );
-      expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(0);
-    });
-
-    test("stored configs 4 - switch back to points and verify restoration", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
-      expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe("points");
-      expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(2);
-      expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("budaS");
-    });
+          colorMap: "batlow",
+        });
+
+        await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 1);
+        await dataStyleStore.setModelSurfacesVertexAttributeRange(
+          id,
+          surface_ids,
+          0,
+          MAX_RANGE_TEST_VALUE,
+        );
+        await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "berlin");
+        expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(1);
+        expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
+          0,
+          MAX_RANGE_TEST_VALUE,
+        ]);
+        expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("berlin");
+
+        await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 0);
+        expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(0);
+        expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        // oxlint-disable-next-line max-expects
+        expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("batlow");
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring vertex attribute — request sent when all params defined",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
+        await dataStyleStore.setModelSurfacesVertexAttributeRange(
+          id,
+          surface_ids,
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        );
+        await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "budaS");
+        await sleep(SLEEP_MS);
+        const lastCall = assertDefined(spy.mock.calls.at(-1), "Expected spy to have been called");
+        expect(lastCall[0].schema).toStrictEqual(model_surfaces_schemas.attribute.vertex.attribute);
+        expect(lastCall[0].params).toStrictEqual(
+          expect.objectContaining({
+            id,
+            block_ids: surface_viewer_ids,
+            name: "points",
+            item: 0,
+            minimum: MINIMUM_RANGE,
+            maximum: MAXIMUM_RANGE,
+          }),
+        );
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 1 - select attribute points and item 2",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
+        await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 2);
+        expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe("points");
+        expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(2);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 2 - set range and colormap",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesVertexAttributeRange(
+          id,
+          surface_ids,
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        );
+        await dataStyleStore.setModelSurfacesVertexAttributeColorMap(id, surface_ids, "budaS");
+        await sleep(SLEEP_MS);
+        expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("budaS");
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 3 - select unique_vertices",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesVertexAttributeName(
+          id,
+          surface_ids,
+          "unique_vertices",
+        );
+        await dataStyleStore.setModelSurfacesVertexAttributeItem(id, surface_ids, 0);
+        expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe(
+          "unique_vertices",
+        );
+        expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(0);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 4 - switch back to points and verify restoration",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesVertexAttributeName(id, surface_ids, "points");
+        expect(dataStyleStore.modelSurfacesVertexAttributeName(id, surface_id)).toBe("points");
+        expect(dataStyleStore.modelSurfacesVertexAttributeItem(id, surface_id)).toBe(2);
+        expect(dataStyleStore.modelSurfacesVertexAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        expect(dataStyleStore.modelSurfacesVertexAttributeColorMap(id, surface_id)).toBe("budaS");
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
 
   describe("surfaces polygon attribute", () => {
-    test("coloring polygon attribute — guard on missing parameters", () => {
-      expect(
-        isModelSurfacesPolygonAttributeValid({
+    test(
+      "coloring polygon attribute — guard on missing parameters",
+      () => {
+        expect(
+          isModelSurfacesPolygonAttributeValid({
+            name: "triangle_vertices",
+            item: 0,
+            minimum: undefined,
+            maximum: undefined,
+            colorMap: undefined,
+          }),
+        ).toBe(false);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring polygon attribute — direct set with full object",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        const polygon_attribute = {
           name: "triangle_vertices",
           item: 0,
-          minimum: undefined,
-          maximum: undefined,
-          colorMap: undefined,
-        }),
-      ).toBe(false);
-    });
-
-    test("coloring polygon attribute — direct set with full object", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      const polygon_attribute = {
-        name: "triangle_vertices",
-        item: 0,
-        minimum: MINIMUM_RANGE,
-        maximum: MAXIMUM_RANGE,
-        colorMap: "batlow",
-      };
-      const result = dataStyleStore.setModelSurfacesPolygonAttribute(
-        id,
-        surface_ids,
-        polygon_attribute,
-      );
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      await sleep(SLEEP_MS);
-      const schema = model_surfaces_schemas.attribute.polygon.attribute;
-      const points = getRGBPointsFromPreset(polygon_attribute.colorMap);
-      const params = {
-        id,
-        block_ids: surface_viewer_ids,
-        name: polygon_attribute.name,
-        item: polygon_attribute.item,
-        points,
-        minimum: polygon_attribute.minimum,
-        maximum: polygon_attribute.maximum,
-        no_data_color: DEFAULT_NO_DATA_COLOR,
-      };
-      expect(spy).toHaveBeenCalledWith({ schema, params });
-      const surface_id = surface_ids[0]!;
-      expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
-        polygon_attribute.name,
-      );
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("coloring polygon attribute — item switching and stored configs restore", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-
-      await dataStyleStore.setModelSurfacesPolygonAttribute(id, surface_ids, {
-        name: "triangle_vertices",
-        item: 0,
-        minimum: MINIMUM_RANGE,
-        maximum: MAXIMUM_RANGE,
-        colorMap: "batlow",
-      });
-
-      await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 1);
-      await dataStyleStore.setModelSurfacesPolygonAttributeRange(
-        id,
-        surface_ids,
-        0,
-        MAX_RANGE_TEST_VALUE,
-      );
-      await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "berlin");
-      expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(1);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
-        0,
-        MAX_RANGE_TEST_VALUE,
-      ]);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("berlin");
-
-      await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 0);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(0);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      // oxlint-disable-next-line max-expects
-      expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("batlow");
-    });
-
-    test("coloring polygon attribute — no request until range+colormap set", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      const result = dataStyleStore.setModelSurfacesPolygonAttributeName(
-        id,
-        surface_ids,
-        "test_attribute",
-      );
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      await sleep(SLEEP_MS);
-      // No request sent yet since minimum/maximum/colorMap are still undefined
-      expect(spy).not.toHaveBeenCalled();
-      for (const surface_id of surface_ids) {
-        expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
-          "test_attribute",
+          minimum: MINIMUM_RANGE,
+          maximum: MAXIMUM_RANGE,
+          colorMap: "batlow",
+        };
+        const result = dataStyleStore.setModelSurfacesPolygonAttribute(
+          id,
+          surface_ids,
+          polygon_attribute,
         );
-      }
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("coloring polygon attribute — request sent when all params defined", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
-      const spy = vi.spyOn(viewerStore, "request");
-      spy.mockClear();
-      await dataStyleStore.setModelSurfacesPolygonAttributeName(id, surface_ids, "test_attribute");
-      await dataStyleStore.setModelSurfacesPolygonAttributeRange(
-        id,
-        surface_ids,
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      );
-      await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "budaS");
-      await sleep(SLEEP_MS);
-      const [lastCall] = spy.mock.calls.slice(-1);
-      expect(lastCall).toBeDefined();
-      expect(lastCall![0].schema).toStrictEqual(model_surfaces_schemas.attribute.polygon.attribute);
-      expect(lastCall![0].params).toStrictEqual(
-        expect.objectContaining({
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        await sleep(SLEEP_MS);
+        const schema = model_surfaces_schemas.attribute.polygon.attribute;
+        const points = getRGBPointsFromPreset(polygon_attribute.colorMap);
+        const params = {
           id,
           block_ids: surface_viewer_ids,
-          name: "test_attribute",
+          name: polygon_attribute.name,
+          item: polygon_attribute.item,
+          points,
+          minimum: polygon_attribute.minimum,
+          maximum: polygon_attribute.maximum,
+          no_data_color: DEFAULT_NO_DATA_COLOR,
+        };
+        expect(spy).toHaveBeenCalledWith({ schema, params });
+        const surface_id = firstElement(surface_ids);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
+          polygon_attribute.name,
+        );
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring polygon attribute — item switching and stored configs restore",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+
+        await dataStyleStore.setModelSurfacesPolygonAttribute(id, surface_ids, {
+          name: "triangle_vertices",
           item: 0,
           minimum: MINIMUM_RANGE,
           maximum: MAXIMUM_RANGE,
-        }),
-      );
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("stored configs 1 - select attribute triangle_vertices and item 2", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesPolygonAttributeName(
-        id,
-        surface_ids,
-        "triangle_vertices",
-      );
-      await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 2);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
-        "triangle_vertices",
-      );
-      expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(2);
-    });
-
-    test("stored configs 2 - set range and colormap", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesPolygonAttributeRange(
-        id,
-        surface_ids,
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      );
-      await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "budaS");
-      await sleep(SLEEP_MS);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("budaS");
-    });
-
-    test("stored configs 3 - select triangle_adjacents", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesPolygonAttributeName(
-        id,
-        surface_ids,
-        "triangle_adjacents",
-      );
-      await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 0);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
-        "triangle_adjacents",
-      );
-      expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(0);
-    });
-
-    test("stored configs 4 - switch back to triangle_vertices and verify restoration", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesPolygonAttributeName(
-        id,
-        surface_ids,
-        "triangle_vertices",
-      );
-      expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
-        "triangle_vertices",
-      );
-      expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(2);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
-        MINIMUM_RANGE,
-        MAXIMUM_RANGE,
-      ]);
-      expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("budaS");
-    });
+          colorMap: "batlow",
+        });
+
+        await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 1);
+        await dataStyleStore.setModelSurfacesPolygonAttributeRange(
+          id,
+          surface_ids,
+          0,
+          MAX_RANGE_TEST_VALUE,
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "berlin");
+        expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(1);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
+          0,
+          MAX_RANGE_TEST_VALUE,
+        ]);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("berlin");
+
+        await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 0);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(0);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        // oxlint-disable-next-line max-expects
+        expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("batlow");
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring polygon attribute — no request until range+colormap set",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        const result = dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          surface_ids,
+          "test_attribute",
+        );
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        await sleep(SLEEP_MS);
+        // No request sent yet since minimum/maximum/colorMap are still undefined
+        expect(spy).not.toHaveBeenCalled();
+        for (const surface_id of surface_ids) {
+          expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
+            "test_attribute",
+          );
+        }
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring polygon attribute — request sent when all params defined",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_viewer_ids = await dataStore.getMeshComponentsViewerIds(id, surface_ids);
+        const spy = vi.spyOn(viewerStore, "request");
+        spy.mockClear();
+        await dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          surface_ids,
+          "test_attribute",
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeRange(
+          id,
+          surface_ids,
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "budaS");
+        await sleep(SLEEP_MS);
+        const lastCall = assertDefined(spy.mock.calls.at(-1), "Expected spy to have been called");
+        expect(lastCall[0].schema).toStrictEqual(
+          model_surfaces_schemas.attribute.polygon.attribute,
+        );
+        expect(lastCall[0].params).toStrictEqual(
+          expect.objectContaining({
+            id,
+            block_ids: surface_viewer_ids,
+            name: "test_attribute",
+            item: 0,
+            minimum: MINIMUM_RANGE,
+            maximum: MAXIMUM_RANGE,
+          }),
+        );
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 1 - select attribute triangle_vertices and item 2",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          surface_ids,
+          "triangle_vertices",
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 2);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
+          "triangle_vertices",
+        );
+        expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(2);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 2 - set range and colormap",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesPolygonAttributeRange(
+          id,
+          surface_ids,
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeColorMap(id, surface_ids, "budaS");
+        await sleep(SLEEP_MS);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("budaS");
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 3 - select triangle_adjacents",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          surface_ids,
+          "triangle_adjacents",
+        );
+        await dataStyleStore.setModelSurfacesPolygonAttributeItem(id, surface_ids, 0);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
+          "triangle_adjacents",
+        );
+        expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(0);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "stored configs 4 - switch back to triangle_vertices and verify restoration",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          surface_ids,
+          "triangle_vertices",
+        );
+        expect(dataStyleStore.modelSurfacesPolygonAttributeName(id, surface_id)).toBe(
+          "triangle_vertices",
+        );
+        expect(dataStyleStore.modelSurfacesPolygonAttributeItem(id, surface_id)).toBe(2);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeRange(id, surface_id)).toStrictEqual([
+          MINIMUM_RANGE,
+          MAXIMUM_RANGE,
+        ]);
+        expect(dataStyleStore.modelSurfacesPolygonAttributeColorMap(id, surface_id)).toBe("budaS");
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
 
   describe("surfaces style", () => {
-    test("surfaces apply style", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const result = dataStyleStore.applyModelSurfacesStyle(id);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
+    test(
+      "surfaces apply style",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const result = dataStyleStore.applyModelSurfacesStyle(id);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
 
   describe("surface component active coloring", () => {
-    test("coloring color", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      const coloringName = "constant";
-      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("coloring vertex", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesVertexAttributeName(id, [surface_id], "points");
-      const coloringName = "vertex";
-      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
-
-    test("coloring polygon", async () => {
-      const dataStyleStore = useDataStyleStore();
-      const viewerStore = useViewerStore();
-      const dataStore = useDataStore();
-      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
-      const surface_id = surface_ids[0]!;
-      await dataStyleStore.setModelSurfacesPolygonAttributeName(id, [surface_id], "test_attribute");
-      const coloringName = "polygon";
-      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
-      expect(result).toBeInstanceOf(Promise);
-      await result;
-      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
-      expect(viewerStore.status).toBe(Status.CONNECTED);
-    });
+    test(
+      "coloring color",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        const coloringName = "constant";
+        const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring vertex",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesVertexAttributeName(id, [surface_id], "points");
+        const coloringName = "vertex";
+        const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
+
+    test(
+      "coloring polygon",
+      async () => {
+        const dataStyleStore = useDataStyleStore();
+        const viewerStore = useViewerStore();
+        const dataStore = useDataStore();
+        const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+        const surface_id = firstElement(surface_ids);
+        await dataStyleStore.setModelSurfacesPolygonAttributeName(
+          id,
+          [surface_id],
+          "test_attribute",
+        );
+        const coloringName = "polygon";
+        const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
+        expect(result).toBeInstanceOf(Promise);
+        await result;
+        expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
+        expect(viewerStore.status).toBe(Status.CONNECTED);
+      },
+      TEST_TIMEOUT_MS,
+    );
   });
 });
diff --git a/tests/unit/components/CrsSelector.nuxt.test.ts b/tests/unit/components/CrsSelector.nuxt.test.ts
index 9ddeb506..26a58142 100644
--- a/tests/unit/components/CrsSelector.nuxt.test.ts
+++ b/tests/unit/components/CrsSelector.nuxt.test.ts
@@ -36,9 +36,10 @@ describe("crs selector", () => {
 
     // Mock backStore.request instead of registerEndpoint
     backStore.request = vi.fn(
-      (_request: unknown, callbacks: { response_function?: (response: unknown) => void }) => {
+      async (_request: unknown, callbacks: { response_function?: (response: unknown) => void }) => {
         callbacks.response_function?.({ crs_list });
-        return Promise.resolve({ crs_list });
+        await Promise.resolve();
+        return { crs_list };
       },
     );
 
@@ -49,9 +50,9 @@ describe("crs selector", () => {
       },
       props: { geodeObjectType: "BRep", keyToUpdate: key_to_update },
     });
-    const td_wrapper = await wrapper.find("td");
+    const td_wrapper = wrapper.find("td");
     await wrapper.vm.$nextTick();
-    const input = await td_wrapper.find("input");
+    const input = td_wrapper.find("input");
     await input.trigger("click");
     expect(wrapper.emitted()).toHaveProperty("update_values");
     expect(wrapper.emitted<unknown[]>().update_values).toHaveLength(EXPECTED_LENGTH);
diff --git a/tests/unit/components/ExtensionSelector.nuxt.test.ts b/tests/unit/components/ExtensionSelector.nuxt.test.ts
index 313e244d..568cb6c7 100644
--- a/tests/unit/components/ExtensionSelector.nuxt.test.ts
+++ b/tests/unit/components/ExtensionSelector.nuxt.test.ts
@@ -8,10 +8,9 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
 import { nextTick } from "vue";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { HTTPMethod } from "h3";
 
 // Local imports
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import ExtensionSelector from "@ogw_front/components/ExtensionSelector.vue";
 import { useBackStore } from "@ogw_front/stores/back";
 
@@ -28,13 +27,10 @@ describe("extension selector", () => {
   beforeEach(() => {
     (backStore as { base_url: string }).base_url = "/";
 
-    backStore.request = vi.fn(() => {
-      const response = {
-        geode_objects_and_output_extensions: {
-          BRep: { msh: { is_saveable: true } },
-        },
-      };
-      return Promise.resolve(response);
+    backStore.request = vi.fn<typeof backStore.request>().mockResolvedValue({
+      geode_objects_and_output_extensions: {
+        BRep: { msh: { is_saveable: true } },
+      },
     });
   });
 
@@ -43,7 +39,7 @@ describe("extension selector", () => {
     const output_extension = "msh";
 
     registerEndpoint(schema.$id, {
-      method: schema.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(schema.methods[FIRST_INDEX]),
       handler: () => ({
         geode_objects_and_output_extensions: {
           BRep: { msh: { is_saveable: true } },
@@ -58,7 +54,7 @@ describe("extension selector", () => {
     });
     await nextTick();
     expect(wrapper.exists()).toBe(true);
-    const v_card = await wrapper.findAllComponents(components.VCard);
+    const v_card = wrapper.findAllComponents(components.VCard);
     await v_card[SECOND_INDEX]?.trigger("click");
     expect(wrapper.emitted()).toHaveProperty("update_values");
     expect(wrapper.emitted<unknown[]>().update_values).toHaveLength(EXPECTED_LENGTH);
diff --git a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.ts b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.ts
index b9a5608f..765c2d28 100644
--- a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.ts
+++ b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.ts
@@ -20,8 +20,9 @@ describe("feedback error banner", () => {
     });
     const reload_spy = vi.spyOn(wrapper.vm, "reload");
     const feedbackStore = useFeedbackStore();
-    await feedbackStore.$patch({ server_error: true });
+    feedbackStore.$patch({ server_error: true });
     expect(feedbackStore.server_error).toBe(true);
+    await wrapper.vm.$nextTick();
     const v_btn = wrapper.findAll(".v-btn");
     await v_btn[0]?.trigger("click");
     expect(reload_spy).toHaveBeenCalledTimes(CALLED_TIMES);
diff --git a/tests/unit/components/FeedBack/Snackers.nuxt.test.ts b/tests/unit/components/FeedBack/Snackers.nuxt.test.ts
index b71aad1f..08295dfc 100644
--- a/tests/unit/components/FeedBack/Snackers.nuxt.test.ts
+++ b/tests/unit/components/FeedBack/Snackers.nuxt.test.ts
@@ -42,7 +42,7 @@ describe("feedback snackers", () => {
     );
 
     expect(feedbackStore.feedbacks).toHaveLength(1);
-    const v_btn = await wrapper.findComponent(components.VBtn);
+    const v_btn = wrapper.findComponent(components.VBtn);
     await v_btn.trigger("click");
     expect(feedbackStore.feedbacks).toHaveLength(0);
   });
diff --git a/tests/unit/components/FileSelector.nuxt.test.ts b/tests/unit/components/FileSelector.nuxt.test.ts
index d553ad26..fcefb155 100644
--- a/tests/unit/components/FileSelector.nuxt.test.ts
+++ b/tests/unit/components/FileSelector.nuxt.test.ts
@@ -6,10 +6,9 @@ import { describe, expect, test, vi } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
 import { flushPromises } from "@vue/test-utils";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { HTTPMethod } from "h3";
 
 // Local imports
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import FileSelector from "@ogw_front/components/FileSelector.vue";
 import FileUploader from "@ogw_front/components/FileUploader.vue";
 import { useBackStore } from "@ogw_front/stores/back";
@@ -28,7 +27,7 @@ describe("file selector", () => {
 
   test("select file", async () => {
     registerEndpoint(allowed_files_schema.$id, {
-      method: allowed_files_schema.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(allowed_files_schema.methods[FIRST_INDEX]),
       handler: () => ({
         extensions: ["1", "2", "3"],
       }),
@@ -43,7 +42,7 @@ describe("file selector", () => {
     const file_uploader = wrapper.findComponent(FileUploader);
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[SECOND_INDEX] as HTTPMethod,
+      method: toHTTPMethod(upload_file_schema.methods[SECOND_INDEX]),
       handler: () => ({}),
     });
 
@@ -70,14 +69,14 @@ describe("file selector", () => {
 
   describe("file selector", () => {
     registerEndpoint(allowed_files_schema.$id, {
-      method: allowed_files_schema.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(allowed_files_schema.methods[FIRST_INDEX]),
       handler: () => ({
         extensions: ["1", "2", "3"],
       }),
     });
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[SECOND_INDEX] as HTTPMethod,
+      method: toHTTPMethod(upload_file_schema.methods[SECOND_INDEX]),
       handler: () => ({}),
     });
     const files = [new File(["fake_file"], "fake_file.txt")];
diff --git a/tests/unit/components/FileUploader.nuxt.test.ts b/tests/unit/components/FileUploader.nuxt.test.ts
index 79a5fe74..d3412946 100644
--- a/tests/unit/components/FileUploader.nuxt.test.ts
+++ b/tests/unit/components/FileUploader.nuxt.test.ts
@@ -6,10 +6,9 @@ import { describe, expect, test } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
 import { flushPromises } from "@vue/test-utils";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { HTTPMethod } from "h3";
 
 // Local imports
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import FileUploader from "@ogw_front/components/FileUploader.vue";
 import { useBackStore } from "@ogw_front/stores/back";
 
@@ -24,11 +23,11 @@ describe("file uploader", () => {
   (backStore as { base_url: string }).base_url = "/";
 
   registerEndpoint(upload_file_schema.$id, {
-    method: upload_file_schema.methods[FIRST_INDEX] as HTTPMethod,
+    method: toHTTPMethod(upload_file_schema.methods[FIRST_INDEX]),
     handler: () => ({}),
   });
   registerEndpoint(upload_file_schema.$id, {
-    method: upload_file_schema.methods[SECOND_INDEX] as HTTPMethod,
+    method: toHTTPMethod(upload_file_schema.methods[SECOND_INDEX]),
     handler: () => ({}),
   });
 
diff --git a/tests/unit/components/MissingFilesSelector.nuxt.test.ts b/tests/unit/components/MissingFilesSelector.nuxt.test.ts
index 3ad9106f..9aecbee5 100644
--- a/tests/unit/components/MissingFilesSelector.nuxt.test.ts
+++ b/tests/unit/components/MissingFilesSelector.nuxt.test.ts
@@ -8,10 +8,9 @@ import { describe, expect, test, vi } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
 import { flushPromises } from "@vue/test-utils";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { HTTPMethod } from "h3";
 
 // Local imports
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import FileUploader from "@ogw_front/components/FileUploader.vue";
 import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector.vue";
 import { useBackStore } from "@ogw_front/stores/back";
@@ -29,17 +28,18 @@ describe("missing files selector", () => {
 
   test("select file", async () => {
     backStore.request = vi.fn(
-      (_request: unknown, callbacks: { response_function?: (response: unknown) => void }) => {
+      async (_request: unknown, callbacks: { response_function?: (response: unknown) => void }) => {
         callbacks?.response_function?.({
           has_missing_files: true,
           mandatory_files: ["fake_file.txt"],
           additional_files: ["fake_file_2.txt"],
         });
-        return Promise.resolve({
+        await Promise.resolve();
+        return {
           has_missing_files: true,
           mandatory_files: ["fake_file.txt"],
           additional_files: ["fake_file_2.txt"],
-        });
+        };
       },
     );
 
@@ -68,7 +68,7 @@ describe("missing files selector", () => {
     const v_btn = file_uploader.findComponent(components.VBtn);
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[SECOND_INDEX] as HTTPMethod,
+      method: toHTTPMethod(upload_file_schema.methods[SECOND_INDEX]),
       handler: () => ({}),
     });
     await v_btn.trigger("click");
diff --git a/tests/unit/components/ObjectSelector.nuxt.test.ts b/tests/unit/components/ObjectSelector.nuxt.test.ts
index 7231f4d3..7d4f5deb 100644
--- a/tests/unit/components/ObjectSelector.nuxt.test.ts
+++ b/tests/unit/components/ObjectSelector.nuxt.test.ts
@@ -5,10 +5,9 @@ import { describe, expect, test } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
 import { flushPromises } from "@vue/test-utils";
 
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import ObjectSelector from "@ogw_front/components/ObjectSelector.vue";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import type { HTTPMethod } from "h3";
 import { useBackStore } from "@ogw_front/stores/back";
 
 const EXPECTED_LENGTH = 1;
@@ -37,9 +36,9 @@ describe("object selector", () => {
       allowed_objects: {},
     };
     const geode_object_1 = "BRep";
-    response["allowed_objects"][geode_object_1] = { is_loadable: true };
+    response.allowed_objects[geode_object_1] = { is_loadable: true };
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(allowed_objects.methods[FIRST_INDEX]),
       handler: () => response,
     });
     const wrapper = await mountSuspended(ObjectSelector, {
@@ -66,10 +65,10 @@ describe("object selector", () => {
     };
     const geode_object_1 = "BRep";
     const geode_object_2 = "EdgedCurve3D";
-    response["allowed_objects"][geode_object_1] = { is_loadable: true };
-    response["allowed_objects"][geode_object_2] = { is_loadable: true };
+    response.allowed_objects[geode_object_1] = { is_loadable: true };
+    response.allowed_objects[geode_object_2] = { is_loadable: true };
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(allowed_objects.methods[FIRST_INDEX]),
       handler: () => response,
     });
     const wrapper = await mountSuspended(ObjectSelector, {
@@ -98,16 +97,16 @@ describe("object selector", () => {
     const response: AllowedObjectsResponse = { allowed_objects: {} };
     const geode_object_1 = "BRep";
     const geode_object_2 = "EdgedCurve3D";
-    response["allowed_objects"][geode_object_1] = {
+    response.allowed_objects[geode_object_1] = {
       is_loadable: LOADABLE_SCORE,
       object_priority: PRIORITY_2,
     };
-    response["allowed_objects"][geode_object_2] = {
+    response.allowed_objects[geode_object_2] = {
       is_loadable: LOADABLE_SCORE,
       object_priority: PRIORITY_1,
     };
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(allowed_objects.methods[FIRST_INDEX]),
       handler: () => response,
     });
     const wrapper = await mountSuspended(ObjectSelector, {
diff --git a/tests/unit/components/PackagesVersions.nuxt.test.ts b/tests/unit/components/PackagesVersions.nuxt.test.ts
index 318a1966..694caabf 100644
--- a/tests/unit/components/PackagesVersions.nuxt.test.ts
+++ b/tests/unit/components/PackagesVersions.nuxt.test.ts
@@ -1,8 +1,7 @@
 import { describe, expect, test } from "vitest";
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime";
-import type { HTTPMethod } from "h3";
 
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod, vuetify } from "@ogw_tests/utils";
 import PackagesVersions from "@ogw_front/components/PackagesVersions.vue";
 import { useBackStore } from "@ogw_front/stores/back";
 
@@ -22,7 +21,7 @@ describe("packages versions", () => {
       additionalProperties: false,
     };
     registerEndpoint(schema.$id, {
-      method: schema.methods[FIRST_INDEX] as HTTPMethod,
+      method: toHTTPMethod(schema.methods[FIRST_INDEX]),
       handler: () => ({
         versions: [
           {
diff --git a/tests/unit/components/ToolPanel.nuxt.test.ts b/tests/unit/components/ToolPanel.nuxt.test.ts
index d39a5889..3150b0d9 100644
--- a/tests/unit/components/ToolPanel.nuxt.test.ts
+++ b/tests/unit/components/ToolPanel.nuxt.test.ts
@@ -9,60 +9,73 @@ import ToolPanel from "@ogw_front/components/ToolPanel.vue";
 import { vuetify } from "@ogw_tests/utils";
 
 const FIRST_INDEX = 0;
+const TIMEOUT = 5000;
 
 describe("tool panel", () => {
-  test("renders title and slot content when open", async () => {
-    const wrapper = await mountSuspended(ToolPanel, {
-      global: {
-        plugins: [vuetify],
-      },
-      props: {
-        modelValue: true,
-        title: "Test Panel",
-      },
-      slots: {
-        default: () => "Panel Content",
-      },
-    });
+  test(
+    "renders title and slot content when open",
+    async () => {
+      const wrapper = await mountSuspended(ToolPanel, {
+        global: {
+          plugins: [vuetify],
+        },
+        props: {
+          modelValue: true,
+          title: "Test Panel",
+        },
+        slots: {
+          default: () => "Panel Content",
+        },
+      });
 
-    expect(wrapper.text()).toContain("Test Panel");
-    expect(wrapper.text()).toContain("Panel Content");
-  });
+      expect(wrapper.text()).toContain("Test Panel");
+      expect(wrapper.text()).toContain("Panel Content");
+    },
+    TIMEOUT,
+  );
 
-  test("triggers escape key binding to close panel", async () => {
-    const wrapper = await mountSuspended(ToolPanel, {
-      global: {
-        plugins: [vuetify],
-      },
-      props: {
-        modelValue: true,
-        title: "Test Panel",
-      },
-    });
+  test(
+    "triggers escape key binding to close panel",
+    async () => {
+      const wrapper = await mountSuspended(ToolPanel, {
+        global: {
+          plugins: [vuetify],
+        },
+        props: {
+          modelValue: true,
+          title: "Test Panel",
+        },
+      });
 
-    globalThis.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape" }));
-    await wrapper.vm.$nextTick();
+      globalThis.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape" }));
+      await wrapper.vm.$nextTick();
 
-    expect(wrapper.emitted()).toHaveProperty("update:modelValue");
-    expect(wrapper.emitted("update:modelValue")?.[FIRST_INDEX]).toStrictEqual([false]);
-  });
+      expect(wrapper.emitted()).toHaveProperty("update:modelValue");
+      expect(wrapper.emitted("update:modelValue")?.[FIRST_INDEX]).toStrictEqual([false]);
+    },
+    TIMEOUT,
+  );
 
-  test("calls escapeFunction prop when Escape key is pressed", async () => {
-    const escapeFunction = vi.fn();
-    const wrapper = await mountSuspended(ToolPanel, {
-      global: {
-        plugins: [vuetify],
-      },
-      props: {
-        escapeFunction,
-        modelValue: true,
-        title: "Test Panel",
-      },
-    });
+  test(
+    "calls escapeFunction prop when Escape key is pressed",
+    async () => {
+      const escapeFunction = vi.fn();
+      const wrapper = await mountSuspended(ToolPanel, {
+        global: {
+          plugins: [vuetify],
+        },
+        props: {
+          escapeFunction,
+          modelValue: true,
+          title: "Test Panel",
+        },
+      });
 
-    globalThis.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape" }));
-    await wrapper.vm.$nextTick();
+      globalThis.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape" }));
+      await wrapper.vm.$nextTick();
 
-    expect(escapeFunction).toHaveBeenCalledWith();
-  });
+      expect(escapeFunction).toHaveBeenCalledWith();
+    },
+    TIMEOUT,
+  );
 });
diff --git a/tests/unit/composables/api_fetch.nuxt.test.ts b/tests/unit/composables/api_fetch.nuxt.test.ts
index 3abec9af..c2e76df8 100644
--- a/tests/unit/composables/api_fetch.nuxt.test.ts
+++ b/tests/unit/composables/api_fetch.nuxt.test.ts
@@ -3,14 +3,14 @@
 // Third party imports
 import { beforeEach, describe, expect, test } from "vitest";
 import { registerEndpoint } from "@nuxt/test-utils/runtime";
-import type { HTTPMethod } from "h3";
 
 // Local imports
-import { setupActivePinia } from "@ogw_tests/utils";
+import { setupActivePinia, toHTTPMethod } from "@ogw_tests/utils";
 import { useBackStore } from "@ogw_front/stores/back";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 
 const FIRST_INDEX = 0;
+const TIMEOUT = 5000;
 
 describe("backStore.request()", () => {
   setupActivePinia();
@@ -31,48 +31,62 @@ describe("backStore.request()", () => {
     additionalProperties: false,
   };
 
-  beforeEach(async () => {
-    await feedbackStore.$reset();
-    await backStore.$reset();
+  beforeEach(() => {
+    feedbackStore.$reset();
+    backStore.$reset();
     (backStore as { base_url: string }).base_url = "";
   });
 
-  test("invalid schema", () => {
-    const invalid_schema = {
-      $id: "/test",
-      type: "object",
-      methods: ["POST"],
-      properties: {
-        test: {
-          type: "number",
+  test(
+    "invalid schema",
+    async () => {
+      const invalid_schema = {
+        $id: "/test",
+        type: "object",
+        methods: ["POST"],
+        properties: {
+          test: {
+            type: "number",
+          },
         },
-      },
-      required: ["test"],
-      additionalProperties: false,
-    };
-    const params = { test: "hello" };
-    expect(() => backStore.request({ schema: invalid_schema, params })).toThrow(
-      "data/test must be number",
-    );
-  });
+        required: ["test"],
+        additionalProperties: false,
+      };
+      const params = { test: "hello" };
+      await expect(backStore.request({ schema: invalid_schema, params })).rejects.toThrow(
+        "data/test must be number",
+      );
+    },
+    TIMEOUT,
+  );
 
-  test("invalid params", () => {
-    expect(() => backStore.request({ schema })).toThrow("data must have required property 'test'");
-  });
+  test(
+    "invalid params",
+    async () => {
+      await expect(backStore.request({ schema })).rejects.toThrow(
+        "data must have required property 'test'",
+      );
+    },
+    TIMEOUT,
+  );
 
-  test("request with callbacks", async () => {
-    const params = { test: "hello" };
-    let errorCalled = false;
-    const callbacks = {
-      request_error_function: () => {
-        errorCalled = true;
-      },
-    };
-    registerEndpoint(schema.$id, {
-      method: schema.methods[FIRST_INDEX] as HTTPMethod,
-      handler: () => ({ result: "success" }),
-    });
-    await backStore.request({ schema, params }, callbacks);
-    expect(errorCalled).toBe(false);
-  });
+  test(
+    "request with callbacks",
+    async () => {
+      const params = { test: "hello" };
+      let errorCalled = false;
+      const callbacks = {
+        request_error_function: (): void => {
+          errorCalled = true;
+        },
+      };
+      registerEndpoint(schema.$id, {
+        method: toHTTPMethod(schema.methods[FIRST_INDEX]),
+        handler: () => ({ result: "success" }),
+      });
+      await backStore.request({ schema, params }, callbacks);
+      expect(errorCalled).toBe(false);
+    },
+    TIMEOUT,
+  );
 });
diff --git a/tests/unit/composables/project_manager.nuxt.test.ts b/tests/unit/composables/project_manager.nuxt.test.ts
index 7e4335e2..5e1ff239 100644
--- a/tests/unit/composables/project_manager.nuxt.test.ts
+++ b/tests/unit/composables/project_manager.nuxt.test.ts
@@ -4,21 +4,28 @@
 // oxlint-disable jest/prefer-ending-with-an-expect
 
 // Third party imports
+import {
+  $fetch,
+  type FetchOptions,
+  type FetchRequest,
+  type FetchResponse,
+  type ResolvedFetchOptions,
+} from "ofetch";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
 import { exportProject, importProject } from "@ogw_front/composables/project_manager";
+import type { api_fetch as apiFetchType } from "@ogw_internal/utils/api_fetch";
 import { appMode } from "@ogw_shared/app_mode";
+import backSchemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { setupActivePinia } from "@ogw_tests/utils";
 
-import { $fetch } from "ofetch";
-
-vi.mock(
-  import("ofetch"),
-  () =>
-    ({
-      $fetch: vi.fn(),
-    }) as any,
-);
+vi.mock(import("ofetch"), () => ({
+  $fetch: Object.assign(vi.fn(), {
+    raw: vi.fn(),
+    native: vi.fn(),
+    create: vi.fn(),
+  }),
+}));
 
 const mockedFetch = vi.mocked($fetch);
 
@@ -160,108 +167,94 @@ const hybridViewerStoreMock = {
 };
 
 // MOCKS
-mockedFetch.mockImplementation(((
-  _route: unknown,
-  // oxlint-disable-next-line eslint/id-length -- mirrors the real ofetch/vitest API field name (`ok`/`fn`)
-  options: { onResponse?: (context: { response: { ok: boolean; _data: unknown } }) => void },
-) => {
-  const data = { snapshot: snapshotMock };
-  // oxlint-disable-next-line eslint/id-length
-  options.onResponse?.({ response: { ok: true, _data: data } });
-  return Promise.resolve(data);
-}) as unknown as typeof $fetch);
+// Resolves a mocked `$fetch` call's `onResponse` hook with a successful response.
+// Mirrors the pattern used in tests/unit/stores/infra.nuxt.test.ts.
+async function respondWithSuccess(
+  options: Readonly<FetchOptions> | undefined,
+  request: FetchRequest,
+  data: unknown,
+): Promise<void> {
+  const onResponse = options?.onResponse;
+  if (typeof onResponse !== "function") {
+    return;
+  }
+  const response: FetchResponse<typeof data> = Object.assign(
+    new Response(undefined, { status: 200 }),
+    { _data: data },
+  );
+  const resolvedOptions: ResolvedFetchOptions = { headers: new Headers() };
+  await onResponse({ request, options: resolvedOptions, response });
+}
+
+const exportProjectBlob = new Blob(["veasecontent"], { type: "application/octet-stream" });
+
+mockedFetch.mockImplementation(async (route, options) => {
+  const data =
+    route === backSchemas.opengeodeweb_back.export_project.$id
+      ? exportProjectBlob
+      : { snapshot: snapshotMock };
+  await respondWithSuccess(options, route, data);
+  return data;
+});
 vi.mock(import("@ogw_internal/utils/viewer_call"), () => ({
   viewer_call: viewer_call_mock_fn,
 }));
 
-interface ApiFetchOptions {
-  response_function?: (response: unknown) => Promise<void> | void;
-}
+// Derived from the real `api_fetch` signature so the mock stays structurally honest instead of redeclaring (and risking drift from) its parameter shapes.
+type ApiFetchParams = Parameters<typeof apiFetchType>[1];
+type ApiFetchHandlers = Parameters<typeof apiFetchType>[2];
 
-vi.mock(
-  import("@ogw_internal/utils/api_fetch"),
-  () =>
-    ({
-      api_fetch: vi.fn(async (_req: unknown, options: ApiFetchOptions = {}) => {
-        const response = {
-          _data: new Blob(["zipcontent"], { type: "application/zip" }),
-          headers: {
-            get: (k: string) => (k === "new-file-name" ? "project_123.vease" : undefined),
-          },
-        };
-        if (options.response_function) {
-          await options.response_function(response);
-        }
-        return response;
-      }),
-    }) as any,
-);
-vi.mock(import("js-file-download"), () => ({ default: vi.fn() }));
-vi.mock(
-  import("@ogw_front/stores/infra"),
-  () =>
-    ({
-      useInfraStore: () => infraStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/viewer"),
-  () =>
-    ({
-      useViewerStore: () => viewerStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/treeview"),
-  () =>
-    ({
-      useTreeviewStore: () => treeviewStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/data"),
-  () =>
-    ({
-      useDataStore: () => dataStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/data_style"),
-  () =>
-    ({
-      useDataStyleStore: () => dataStyleStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/hybrid_viewer"),
-  () =>
-    ({
-      useHybridViewerStore: () => hybridViewerStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/back"),
-  () =>
-    ({
-      useBackStore: () => backStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/feedback"),
-  () =>
-    ({
-      useFeedbackStore: () => feedbackStoreMock,
-    }) as any,
-);
-vi.mock(
-  import("@ogw_front/stores/app"),
-  () =>
-    ({
-      useAppStore: () => ({
-        exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
-      }),
-    }) as any,
-);
+vi.mock(import("@ogw_internal/utils/api_fetch"), () => ({
+  api_fetch: vi.fn(
+    async (_microservice: unknown, _params: ApiFetchParams, options: ApiFetchHandlers = {}) => {
+      const response = {
+        _data: new Blob(["zipcontent"], { type: "application/zip" }),
+        headers: {
+          get: (k: string): string | undefined =>
+            k === "new-file-name" ? "project_123.vease" : undefined,
+        },
+      };
+      if (options.response_function) {
+        await options.response_function(response);
+      }
+      return response;
+    },
+  ),
+}));
+vi.mock(import("js-file-download"), () => ({
+  default: vi.fn((): void => undefined),
+}));
+vi.mock(import("@ogw_front/stores/infra") as Promise<unknown>, () => ({
+  useInfraStore: (): typeof infraStoreMock => infraStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/viewer") as Promise<unknown>, () => ({
+  useViewerStore: (): typeof viewerStoreMock => viewerStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/treeview") as Promise<unknown>, () => ({
+  useTreeviewStore: (): typeof treeviewStoreMock => treeviewStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/data") as Promise<unknown>, () => ({
+  useDataStore: (): typeof dataStoreMock => dataStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/data_style") as Promise<unknown>, () => ({
+  useDataStyleStore: (): typeof dataStyleStoreMock => dataStyleStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/hybrid_viewer") as Promise<unknown>, () => ({
+  useHybridViewerStore: (): typeof hybridViewerStoreMock => hybridViewerStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/back") as Promise<unknown>, () => ({
+  useBackStore: (): typeof backStoreMock => backStoreMock,
+}));
+vi.mock(import("@ogw_front/stores/feedback") as Promise<unknown>, () => ({
+  useFeedbackStore: (): typeof feedbackStoreMock => feedbackStoreMock,
+}));
+const appStoreMock = {
+  exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
+};
+
+vi.mock(import("@ogw_front/stores/app") as Promise<unknown>, () => ({
+  useAppStore: (): typeof appStoreMock => appStoreMock,
+}));
 
 vi.stubGlobal("useAppStore", () => ({
   exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
@@ -273,19 +266,25 @@ const mockLockRequest = vi
     async (name: string, task: (lock: { name: string }) => unknown) => await task({ name }),
   );
 
-vi.stubGlobal("navigator", {
-  ...navigator,
-  locks: {
-    request: mockLockRequest,
-  },
-});
+// Proxies rather than spreads `navigator` so its prototype (and the private fields some getters, like `userAgent`, rely on) stays intact; only `locks` is overridden.
+vi.stubGlobal(
+  "navigator",
+  new Proxy(navigator, {
+    get(target, prop): unknown {
+      if (prop === "locks") {
+        return { request: mockLockRequest };
+      }
+      return Reflect.get(target, prop, target);
+    },
+  }),
+);
 
-function verifyViewerCalls() {
+function verifyViewerCalls(): void {
   expect(viewerStoreMock.ws_connect).toHaveBeenCalledWith();
   expect(viewer_call_mock_fn).toHaveBeenCalledTimes(VIEWER_CALL_COUNT);
 }
 
-function verifyStoreImports() {
+function verifyStoreImports(): void {
   expect(treeviewStoreMock.importStores).toHaveBeenCalledWith(snapshotMock.treeview);
   expect(dataStoreMock.importStores).toHaveBeenCalledWith(snapshotMock.data);
   expect(hybridViewerStoreMock.initHybridViewer).toHaveBeenCalledWith();
@@ -293,7 +292,7 @@ function verifyStoreImports() {
   expect(hybridViewerStoreMock.setZScaling).toHaveBeenCalledWith(Z_SCALE);
 }
 
-function verifyDataManagement() {
+function verifyDataManagement(): void {
   expect(dataStyleStoreMock.importStores).toHaveBeenCalledWith(snapshotMock.dataStyle);
   expect(dataStyleStoreMock.applyAllStylesFromState).toHaveBeenCalledWith();
   expect(dataStoreMock.registerObject).toHaveBeenCalledWith("abc123", "My Data");
@@ -301,7 +300,7 @@ function verifyDataManagement() {
   expect(treeviewStoreMock.addItem).toHaveBeenCalledWith("PointSet2D", "My Data", "abc123", "mesh");
 }
 
-function verifyRemaining() {
+function verifyRemaining(): void {
   expect(hybridViewerStoreMock.addItem).toHaveBeenCalledWith("abc123");
   expect(dataStyleStoreMock.addDataStyle).toHaveBeenCalledWith("abc123", "PointSet2D");
   expect(dataStyleStoreMock.applyDefaultStyle).toHaveBeenCalledWith("abc123");
@@ -324,7 +323,7 @@ describe("projectManager composable (compact)", () => {
     for (const store of storesList) {
       const values = Object.values(store);
       for (const value of values) {
-        if (typeof value === "function" && value.mockClear) {
+        if (typeof value === "function" && typeof value.mockClear === "function") {
           value.mockClear();
         }
       }
@@ -337,7 +336,7 @@ describe("projectManager composable (compact)", () => {
 
     await exportProject();
 
-    expect(fileDownload).toHaveBeenCalledWith({ snapshot: snapshotMock }, "project.vease");
+    expect(fileDownload).toHaveBeenCalledWith(exportProjectBlob, "project.vease");
     expect(feedbackStoreMock.add_success).toHaveBeenCalledWith("Project exported successfully");
   });
 
diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.ts b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.ts
index 779f6e3c..3cc3d087 100644
--- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.ts
+++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.ts
@@ -8,11 +8,9 @@ import { runFunctionWhenMicroservicesConnected } from "@ogw_front/composables/ru
 import { setupActivePinia } from "@ogw_tests/utils";
 import { useBackStore } from "@ogw_front/stores/back";
 import { useInfraStore } from "@ogw_front/stores/infra";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Microservice } from "@ogw_front/stores/infra";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
-const dumb_obj = { dumb_method: () => true };
+const dumb_obj = { dumb_method: (): boolean => true };
 // These are assigned in beforeEach (a real defined value by the time any test runs) rather than at declaration, so a `| undefined` type would just force needless narrowing at every call site below.
 // oxlint-disable-next-line eslint/init-declarations
 let infraStore: ReturnType<typeof useInfraStore>;
@@ -29,8 +27,8 @@ describe("when_microservices_connected_run_function", () => {
     viewerStore = useViewerStore();
 
     // Register microservices in infra store
-    infraStore.register_microservice(backStore as unknown as Microservice);
-    infraStore.register_microservice(viewerStore as unknown as Microservice);
+    infraStore.register_microservice(backStore);
+    infraStore.register_microservice(viewerStore);
 
     backStore.$patch({ status: Status.NOT_CONNECTED });
     viewerStore.$patch({ status: Status.NOT_CONNECTED });
@@ -38,7 +36,9 @@ describe("when_microservices_connected_run_function", () => {
 
   test("microservices not connected", () => {
     const spy = vi.spyOn(dumb_obj, "dumb_method");
-    runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method);
+    runFunctionWhenMicroservicesConnected(() => {
+      dumb_obj.dumb_method();
+    });
     backStore.$patch({ status: Status.NOT_CONNECTED });
     viewerStore.$patch({ status: Status.NOT_CONNECTED });
     expect(spy).not.toHaveBeenCalled();
@@ -46,7 +46,9 @@ describe("when_microservices_connected_run_function", () => {
 
   test("microservices connected", async () => {
     const spy = vi.spyOn(dumb_obj, "dumb_method");
-    runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method);
+    runFunctionWhenMicroservicesConnected(() => {
+      dumb_obj.dumb_method();
+    });
     backStore.$patch({ status: Status.CONNECTED });
     viewerStore.$patch({ status: Status.CONNECTED });
     await flushPromises();
diff --git a/tests/unit/composables/upload_file.nuxt.test.ts b/tests/unit/composables/upload_file.nuxt.test.ts
index 6cd2ea86..87c0f561 100644
--- a/tests/unit/composables/upload_file.nuxt.test.ts
+++ b/tests/unit/composables/upload_file.nuxt.test.ts
@@ -11,6 +11,17 @@ import { useFeedbackStore } from "@ogw_front/stores/feedback";
 const ZERO = 0;
 const schema = schemas.opengeodeweb_back.upload_file;
 
+function assertIsTestResponse(value: unknown): asserts value is { test: string } {
+  const is_test_response =
+    typeof value === "object" &&
+    value !== null &&
+    "test" in value &&
+    typeof value.test === "string";
+  if (!is_test_response) {
+    throw new Error("Response does not have the expected shape");
+  }
+}
+
 describe("upload_file", () => {
   beforeEach(() => {
     setupActivePinia();
@@ -22,9 +33,9 @@ describe("upload_file", () => {
     const backStore = useBackStore();
     const file = "toto";
 
-    await expect(backStore.upload(file as unknown as File)).rejects.toThrow(
-      "file must be an instance of File",
-    );
+    // Upload requires a real File; this intentionally passes an invalid runtime value to exercise its instanceof File guard, declared with @ts-expect-error instead of an unsafe type assertion.
+    // @ts-expect-error intentionally invalid runtime type to test the File guard
+    await expect(backStore.upload(file)).rejects.toThrow("file must be an instance of File");
   });
 
   test("onResponse", async () => {
@@ -38,7 +49,8 @@ describe("upload_file", () => {
     let response_value = "";
     await backStore.upload(file, {
       response_function: (response: unknown) => {
-        response_value = (response as { test: string }).test;
+        assertIsTestResponse(response);
+        response_value = response.test;
       },
     });
     expect(feedbackStore.feedbacks).toHaveLength(ZERO);
diff --git a/tests/unit/composables/virtual_tree.nuxt.test.ts b/tests/unit/composables/virtual_tree.nuxt.test.ts
index 2f99e3d4..dd28bc05 100644
--- a/tests/unit/composables/virtual_tree.nuxt.test.ts
+++ b/tests/unit/composables/virtual_tree.nuxt.test.ts
@@ -5,7 +5,7 @@ import { describe, expect, test, vi } from "vitest";
 import { ref } from "vue";
 
 // Local imports
-import { useVirtualTree } from "@ogw_front/composables/virtual_tree";
+import { type EmitFn, useVirtualTree } from "@ogw_front/composables/virtual_tree";
 
 describe("virtual tree composable", () => {
   test("correctly handles empty collections without treating them as leaf nodes", () => {
@@ -39,7 +39,7 @@ describe("virtual tree composable", () => {
       selection: { selectable: true, strategy: "classic" },
     });
 
-    const emit = vi.fn();
+    const emit = vi.fn<EmitFn>();
     const { isSelected, getIndeterminate } = useVirtualTree(props, emit);
 
     // 1. The empty collection has no leaf children, so it should not be considered selected
diff --git a/tests/unit/plugins/project_load.nuxt.test.ts b/tests/unit/plugins/project_load.nuxt.test.ts
index 39af07fd..053d4f05 100644
--- a/tests/unit/plugins/project_load.nuxt.test.ts
+++ b/tests/unit/plugins/project_load.nuxt.test.ts
@@ -2,6 +2,10 @@
 // oxlint-disable vitest/require-mock-type-parameters
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
+import type { StoreGeneric } from "pinia";
+
+import type { ModelComponentRecord } from "@ogw_front/stores/data_helpers/mesh.js";
+import type { ModelComponentRelationRecord } from "@ogw_front/stores/data.js";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -15,26 +19,44 @@ const PANEL_WIDTH = 320;
 const Z_SCALE = 1.5;
 const STORES_SLICE_START = 1;
 
+// Normalizes the (optional) legacy `items` field read off the mock snapshot into a plain
+// Array, so the test body can `.map()` over it without branching inline.
+function toItemsArray(items: Record<string, unknown>[] | undefined): Record<string, unknown>[] {
+  return items ?? [];
+}
+
 vi.mock(import("@ogw_internal/utils/viewer_call"), () => ({
   viewer_call: vi.fn(async () => {
     await Promise.resolve();
   }),
 }));
-vi.mock(
-  import("@ogw_front/stores/hybrid_viewer"),
-  () =>
-    ({
-      useHybridViewerStore: () => ({
-        $id: "hybridViewer",
-        initHybridViewer: vi.fn(),
-        clear: vi.fn(),
-        addItem: vi.fn(),
-        setZScaling: vi.fn(),
-        save: vi.fn(),
-        load: vi.fn(),
-      }),
-    }) as any,
-);
+// Replaces only the handful of methods this test exercises, keeping every other member
+// (including the function's own `$id`/`$patch`/... store internals) from the real store, so
+// The mock genuinely satisfies `useHybridViewerStore`'s type without any unsafe assertion.
+vi.mock(import("@ogw_front/stores/hybrid_viewer"), async (importOriginal) => {
+  const actual = await importOriginal();
+  const mockedUseHybridViewerStore = Object.assign(
+    (): ReturnType<typeof actual.useHybridViewerStore> & {
+      save: () => void;
+      load: () => void;
+    } => {
+      const store = actual.useHybridViewerStore();
+      store.initHybridViewer = vi.fn(async (): Promise<void> => {
+        await Promise.resolve();
+      });
+      store.clear = vi.fn((): void => undefined);
+      store.addItem = vi.fn(async (): Promise<void> => {
+        await Promise.resolve();
+      });
+      store.setZScaling = vi.fn(async (): Promise<void> => {
+        await Promise.resolve();
+      });
+      return Object.assign(store, { save: vi.fn(), load: vi.fn() });
+    },
+    actual.useHybridViewerStore,
+  );
+  return { useHybridViewerStore: mockedUseHybridViewerStore };
+});
 
 describe("project import", () => {
   beforeEach(() => {
@@ -56,16 +78,26 @@ describe("project import", () => {
     // Test, so it still exercises the intended behavior at runtime, but the mismatch with
     // The current store signature suggests this test (and/or the store) may be stale -
     // Flagging for review rather than silently changing behavior during the TS migration.
-    vi.spyOn(stores.dataBase, "importStores").mockImplementation((async (snapshot: {
-      items: Record<string, unknown>[];
-    }) => {
-      const { items } = snapshot;
-      await Promise.all(items.map((item) => database.data!.put(item)));
-    }) as unknown as typeof stores.dataBase.importStores);
+    vi.spyOn(stores.dataBase, "importStores").mockImplementation(
+      async (
+        snapshot: {
+          readonly modelComponents: readonly ModelComponentRecord[];
+          readonly modelComponentsRelations: readonly ModelComponentRelationRecord[];
+        } & { items?: Record<string, unknown>[] },
+      ) => {
+        const { items } = snapshot;
+        await Promise.all(
+          toItemsArray(items).map(async (item) => {
+            const result = await database.data?.put(item);
+            return result;
+          }),
+        );
+      },
+    );
 
-    const storesArray = Object.values(stores);
+    const storesArray: StoreGeneric[] = Object.values(stores);
     for (const store of storesArray.slice(STORES_SLICE_START)) {
-      stores.app.registerStore(store as unknown as Parameters<typeof stores.app.registerStore>[0]);
+      stores.app.registerStore(store);
     }
 
     const snapshot = {
@@ -101,11 +133,11 @@ describe("project import", () => {
 
     await stores.app.importStores(snapshot);
 
-    const item = await database.data!.get("abc123");
+    const item = await database.data?.get("abc123");
     expect(item).toBeDefined();
     expect(item?.id).toBe("abc123");
 
-    const style = await database.data_style!.get("abc123");
+    const style = await database.data_style?.get("abc123");
     expect(style).toBeDefined();
     expect(style?.id).toBe("abc123");
   });
diff --git a/tests/unit/stores/back.nuxt.test.ts b/tests/unit/stores/back.nuxt.test.ts
index 3cc62786..ecf88ab6 100644
--- a/tests/unit/stores/back.nuxt.test.ts
+++ b/tests/unit/stores/back.nuxt.test.ts
@@ -137,12 +137,12 @@ describe("geode store actions", () => {
   });
 
   describe("request counter", () => {
-    test("increment/decrement", async () => {
+    test("increment/decrement", () => {
       const backStore = useBackStore();
       expect(backStore.request_counter).toBe(EXPECTED_NO_REQUEST);
-      await backStore.start_request();
+      backStore.start_request();
       expect(backStore.request_counter).toBe(EXPECTED_ONE_REQUEST);
-      await backStore.stop_request();
+      backStore.stop_request();
       expect(backStore.request_counter).toBe(EXPECTED_NO_REQUEST);
     });
   });
diff --git a/tests/unit/stores/cloud.nuxt.test.ts b/tests/unit/stores/cloud.nuxt.test.ts
index eae360bd..7a0dd267 100644
--- a/tests/unit/stores/cloud.nuxt.test.ts
+++ b/tests/unit/stores/cloud.nuxt.test.ts
@@ -1,8 +1,8 @@
 // Only ever fires now that tests are .ts; asks every bare `vi.fn()` mock to carry an explicit call-signature type parameter. Real value for a handful of mocks, but for the many plain mock objects across this test suite it would mean guessing a signature that's already implied by how the mock is used (risking a type that quietly doesn't match, which defeats the point) rather than deriving it from each real function - left off rather than doing that at scale.
 // oxlint-disable vitest/require-mock-type-parameters
 // Third party imports
+import { $fetch, type FetchContext, type FetchResponse } from "ofetch";
 import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest";
-import { $fetch } from "ofetch";
 
 // Local imports
 import { Status } from "@ogw_front/utils/status";
@@ -10,24 +10,57 @@ import { setupActivePinia } from "@ogw_tests/utils";
 import { useCloudStore } from "@ogw_front/stores/cloud";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 
-vi.mock(
-  import("ofetch"),
-  () =>
-    ({
-      $fetch: vi.fn(),
-    }) as any,
-);
+// A hand-built `$Fetch`: a mock function plus the `raw`/`native`/`create` members the real
+// `ofetch` export carries, so it satisfies the real type directly (no unsafe cast needed).
+vi.mock(import("ofetch"), () => ({
+  $fetch: Object.assign(vi.fn(), { raw: vi.fn(), native: vi.fn(), create: vi.fn() }),
+}));
 
 const mockedFetch = vi.mocked($fetch);
 
 // CONSTANTS
 const PROJECT = "project";
+const RESPONSE_OK_STATUS = 200;
+const RESPONSE_ERROR_STATUS = 500;
 
-function setupConfig() {
+function setupConfig(): void {
   const config = useRuntimeConfig();
   config.public.PROJECT = PROJECT;
 }
 
+// Normalizes ofetch's `MaybeArray<Hook>` option fields (a single hook or an array of hooks)
+// Into a plain array, so tests can invoke every registered hook the same way.
+function toHookArray<Hook>(hooks: Hook | Hook[] | undefined): Hook[] {
+  if (Array.isArray(hooks)) {
+    return hooks;
+  }
+  return hooks === undefined ? [] : [hooks];
+}
+
+// Builds a minimal, real `FetchResponse` (a `Response` with an attached `_data`) so
+// Hook callbacks receive an object that genuinely satisfies ofetch's response type.
+function buildFetchResponse<ResponseData>(
+  responseData: ResponseData,
+  status: number,
+): FetchResponse<ResponseData> {
+  const response: FetchResponse<ResponseData> = Response.json(responseData, { status });
+  response._data = responseData;
+  return response;
+}
+
+// Builds a minimal, real `FetchContext` (plus the response) to hand to `onResponse`/
+// `onResponseError` hooks, satisfying ofetch's hook signature without any unsafe cast.
+function buildFetchContext<ResponseData>(
+  responseData: ResponseData,
+  status: number,
+): FetchContext & { response: FetchResponse<ResponseData> } {
+  return {
+    request: "test.com",
+    options: { headers: new Headers() },
+    response: buildFetchResponse(responseData, status),
+  };
+}
+
 describe("cloud store", () => {
   beforeEach(() => {
     setupActivePinia();
@@ -51,18 +84,16 @@ describe("cloud store", () => {
         const cloudStore = useCloudStore();
         const feedbackStore = useFeedbackStore();
 
-        mockedFetch.mockImplementation(((
-          _route: unknown,
-          options: {
-            // oxlint-disable-next-line eslint/id-length -- mirrors the real ofetch/vitest API field name (`ok`/`fn`)
-            onResponse?: (context: { response: { ok: boolean; _data: unknown } }) => void;
-          },
-        ) => {
+        mockedFetch.mockImplementation(async (_route, options) => {
           const data = { url: "test.com" };
-          // oxlint-disable-next-line eslint/id-length
-          options.onResponse?.({ response: { ok: true, _data: data } });
-          return Promise.resolve(data);
-        }) as unknown as typeof $fetch);
+          const onResponseHooks = toHookArray(options?.onResponse);
+          await Promise.all(
+            onResponseHooks.map(async (hook) => {
+              await hook(buildFetchContext(data, RESPONSE_OK_STATUS));
+            }),
+          );
+          return data;
+        });
 
         await cloudStore.launch("noreply@example.com");
 
@@ -77,19 +108,18 @@ describe("cloud store", () => {
 
         const error = createError({ statusCode: 500, statusMessage: "500 Internal Server Error" });
 
-        mockedFetch.mockImplementation(((
-          _route: unknown,
-          options: {
-            onResponseError?: (context: {
-              response: { status: number; name: string; description: string };
-            }) => void;
-          },
-        ) => {
-          options.onResponseError?.({
-            response: { status: 500, name: "Error", description: "500 Internal Server Error" },
-          });
-          return Promise.reject(error);
-        }) as unknown as typeof $fetch);
+        mockedFetch.mockImplementation((_route, options) => {
+          const onResponseErrorHooks = toHookArray(options?.onResponseError);
+          for (const hook of onResponseErrorHooks) {
+            void hook(
+              buildFetchContext(
+                { name: "Error", description: "500 Internal Server Error" },
+                RESPONSE_ERROR_STATUS,
+              ),
+            );
+          }
+          throw error;
+        });
 
         await expect(cloudStore.launch("noreply@example.com")).rejects.toThrow(
           "500 Internal Server Error",
@@ -101,9 +131,9 @@ describe("cloud store", () => {
     });
 
     describe("connect", () => {
-      test("successful connect", async () => {
+      test("successful connect", () => {
         const cloudStore = useCloudStore();
-        await cloudStore.connect();
+        cloudStore.connect();
         expect(cloudStore.status).toBe(Status.CONNECTED);
       });
     });
diff --git a/tests/unit/stores/feedback.nuxt.test.ts b/tests/unit/stores/feedback.nuxt.test.ts
index 2218c1ba..a12bf8e9 100644
--- a/tests/unit/stores/feedback.nuxt.test.ts
+++ b/tests/unit/stores/feedback.nuxt.test.ts
@@ -6,6 +6,12 @@ import { useFeedbackStore } from "@ogw_front/stores/feedback";
 
 const ERROR_500 = 500;
 
+function assertIsDefined<Value>(value: Value | undefined): asserts value is Value {
+  if (value === undefined) {
+    throw new Error("Expected value to be defined");
+  }
+}
+
 describe("feedback store", () => {
   beforeEach(() => {
     setupActivePinia();
@@ -26,17 +32,19 @@ describe("feedback store", () => {
 
   describe("actions", () => {
     describe("add_error", () => {
-      test("add_error", async () => {
+      test("add_error", () => {
         const feedbackStore = useFeedbackStore();
-        await feedbackStore.add_error(ERROR_500, "/test", "test message", "test description");
+        feedbackStore.add_error(ERROR_500, "/test", "test message", "test description");
         expect(feedbackStore.feedbacks).toHaveLength(1);
-        expect(feedbackStore.feedbacks[0]!.type).toBe("error");
+        const [feedback] = feedbackStore.feedbacks;
+        assertIsDefined(feedback);
+        expect(feedback.type).toBe("error");
       });
 
-      test("feedbacks_timeout", async () => {
+      test("feedbacks_timeout", () => {
         const feedbackStore = useFeedbackStore();
         feedbackStore.feedbacks_timeout_miliseconds = 500;
-        await feedbackStore.add_error(ERROR_500, "/test", "test message", "test description");
+        feedbackStore.add_error(ERROR_500, "/test", "test message", "test description");
         expect(feedbackStore.feedbacks).toHaveLength(1);
         vi.runAllTimers();
         expect(feedbackStore.feedbacks).toHaveLength(0);
@@ -44,36 +52,41 @@ describe("feedback store", () => {
     });
 
     describe("add_success", () => {
-      test("add_success", async () => {
+      test("add_success", () => {
         const feedbackStore = useFeedbackStore();
         feedbackStore.feedbacks_timeout_miliseconds = 500;
-        await feedbackStore.add_success("test description");
+        feedbackStore.add_success("test description");
         expect(feedbackStore.feedbacks).toHaveLength(1);
-        expect(feedbackStore.feedbacks[0]!.type).toBe("success");
+        const [feedback] = feedbackStore.feedbacks;
+        assertIsDefined(feedback);
+        expect(feedback.type).toBe("success");
         vi.runAllTimers();
         expect(feedbackStore.feedbacks).toHaveLength(0);
       });
     });
 
     describe("add_warning", () => {
-      test("add_warning", async () => {
+      test("add_warning", () => {
         const feedbackStore = useFeedbackStore();
         feedbackStore.feedbacks_timeout_miliseconds = 500;
-        await feedbackStore.add_warning("test warning description");
+        feedbackStore.add_warning("test warning description");
         expect(feedbackStore.feedbacks).toHaveLength(1);
-        expect(feedbackStore.feedbacks[0]!.type).toBe("warning");
+        const [feedback] = feedbackStore.feedbacks;
+        assertIsDefined(feedback);
+        expect(feedback.type).toBe("warning");
         vi.runAllTimers();
         expect(feedbackStore.feedbacks).toHaveLength(0);
       });
     });
 
     describe("delete_feedback", () => {
-      test("delete_feedback", async () => {
+      test("delete_feedback", () => {
         const feedbackStore = useFeedbackStore();
-        await feedbackStore.add_success("test description");
+        feedbackStore.add_success("test description");
         expect(feedbackStore.feedbacks).toHaveLength(1);
-        const feedbackId = feedbackStore.feedbacks[0]!.id;
-        feedbackStore.delete_feedback(feedbackId);
+        const [feedback] = feedbackStore.feedbacks;
+        assertIsDefined(feedback);
+        feedbackStore.delete_feedback(feedback.id);
         expect(feedbackStore.feedbacks).toHaveLength(0);
       });
     });
diff --git a/tests/unit/stores/infra.nuxt.test.ts b/tests/unit/stores/infra.nuxt.test.ts
index cf8c4597..6a0ff36f 100644
--- a/tests/unit/stores/infra.nuxt.test.ts
+++ b/tests/unit/stores/infra.nuxt.test.ts
@@ -1,8 +1,14 @@
 // Only ever fires now that tests are .ts; asks every bare `vi.fn()` mock to carry an explicit call-signature type parameter. Real value for a handful of mocks, but for the many plain mock objects across this test suite it would mean guessing a signature that's already implied by how the mock is used (risking a type that quietly doesn't match, which defeats the point) rather than deriving it from each real function - left off rather than doing that at scale.
 // oxlint-disable vitest/require-mock-type-parameters
 // Third party imports
+import {
+  $fetch,
+  type FetchOptions,
+  type FetchRequest,
+  type FetchResponse,
+  type ResolvedFetchOptions,
+} from "ofetch";
 import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest";
-import { $fetch } from "ofetch";
 
 // Local imports
 import { Status } from "@ogw_front/utils/status";
@@ -10,29 +16,54 @@ import { appMode } from "@ogw_shared/app_mode";
 import { setupActivePinia } from "@ogw_tests/utils";
 import { useBackStore } from "@ogw_front/stores/back";
 import { useInfraStore } from "@ogw_front/stores/infra";
-// oxlint-disable-next-line eslint/no-duplicate-imports
-import type { Microservice } from "@ogw_front/stores/infra";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
-vi.mock(
-  import("ofetch"),
-  () =>
-    ({
-      $fetch: vi.fn(),
-    }) as any,
-);
+vi.mock(import("ofetch"), () => ({
+  $fetch: Object.assign(vi.fn(), {
+    raw: vi.fn(),
+    native: vi.fn(),
+    create: vi.fn(),
+  }),
+}));
 
 // Mock navigator.locks API
 const mockLockRequest = vi
   .fn()
-  .mockImplementation(async (name, handler) => await handler({ name }));
+  .mockImplementation(
+    async (name: string, handler: (lock: { name: string }) => unknown) => await handler({ name }),
+  );
+
+// A Proxy is used instead of `{ ...navigator }` so navigator's other getters keep their original `this` (cloning a `Navigator` class instance would lose access to its private fields).
+vi.stubGlobal(
+  "navigator",
+  new Proxy(navigator, {
+    get(target, property, _receiver): unknown {
+      if (property === "locks") {
+        return { request: mockLockRequest };
+      }
+      return Reflect.get(target, property, target) as unknown;
+    },
+  }),
+);
 
-vi.stubGlobal("navigator", {
-  ...navigator,
-  locks: {
-    request: mockLockRequest,
-  },
-});
+// Resolves a mocked `$fetch` call's `onResponse` hook with a successful response.
+// Kept outside the test bodies so no branching logic lives inside `test()` blocks.
+async function respondWithSuccess(
+  options: Readonly<FetchOptions> | undefined,
+  request: FetchRequest,
+  data: Readonly<{ url: string }>,
+): Promise<void> {
+  const onResponse = options?.onResponse;
+  if (typeof onResponse !== "function") {
+    return;
+  }
+  const response: FetchResponse<typeof data> = Object.assign(
+    new Response(undefined, { status: 200 }),
+    { _data: data },
+  );
+  const resolvedOptions: ResolvedFetchOptions = { headers: new Headers() };
+  await onResponse({ request, options: resolvedOptions, response });
+}
 
 describe("infra store", () => {
   beforeEach(() => {
@@ -85,8 +116,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ status: Status.NOT_CONNECTED });
         viewerStore.$patch({ status: Status.NOT_CONNECTED });
@@ -98,8 +129,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ status: Status.CONNECTED });
         viewerStore.$patch({ status: Status.NOT_CONNECTED });
@@ -111,8 +142,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ status: Status.NOT_CONNECTED });
         viewerStore.$patch({ status: Status.CONNECTED });
@@ -124,8 +155,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ status: Status.CONNECTED });
         viewerStore.$patch({ status: Status.CONNECTED });
@@ -144,8 +175,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ request_counter: 0 });
         viewerStore.$patch({ request_counter: 0 });
@@ -157,8 +188,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ request_counter: 1 });
         viewerStore.$patch({ request_counter: 0 });
@@ -170,8 +201,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ request_counter: 0 });
         viewerStore.$patch({ request_counter: 1 });
@@ -183,8 +214,8 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
+        infraStore.register_microservice(viewerStore);
 
         backStore.$patch({ request_counter: 1 });
         viewerStore.$patch({ request_counter: 1 });
@@ -199,7 +230,7 @@ describe("infra store", () => {
         const infraStore = useInfraStore();
         const backStore = useBackStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
 
         expect(infraStore.microservices).toHaveLength(1);
         expect(infraStore.microservices[0]?.$id).toBe("back");
@@ -210,9 +241,9 @@ describe("infra store", () => {
         const backStore = useBackStore();
         const viewerStore = useViewerStore();
 
-        infraStore.register_microservice(backStore as unknown as Microservice);
+        infraStore.register_microservice(backStore);
 
-        infraStore.register_microservice(viewerStore as unknown as Microservice);
+        infraStore.register_microservice(viewerStore);
 
         expect(infraStore.microservices).toHaveLength(2);
       });
@@ -227,16 +258,11 @@ describe("infra store", () => {
 
       infraStore.app_mode = appMode.CLOUD;
       const url = "test.com";
-      vi.mocked($fetch).mockImplementation(((
-        _route: unknown,
-        // oxlint-disable-next-line eslint/id-length -- mirrors the real ofetch/vitest API field name (`ok`/`fn`)
-        options: { onResponse?: (context: { response: { ok: boolean; _data: unknown } }) => void },
-      ) => {
+      vi.mocked($fetch).mockImplementation(async (_route, options) => {
         const data = { url };
-        // oxlint-disable-next-line eslint/id-length
-        options.onResponse?.({ response: { ok: true, _data: data } });
-        return Promise.resolve(data);
-      }) as unknown as typeof $fetch);
+        await respondWithSuccess(options, _route, data);
+        return data;
+      });
 
       await infraStore.create_backend("noreply@example.com");
       expect(infraStore.status).toBe(Status.CREATED);
diff --git a/tests/unit/stores/treeview.nuxt.test.ts b/tests/unit/stores/treeview.nuxt.test.ts
index 166b9f84..1363633d 100644
--- a/tests/unit/stores/treeview.nuxt.test.ts
+++ b/tests/unit/stores/treeview.nuxt.test.ts
@@ -5,6 +5,16 @@ import { beforeEach, describe, expect, expectTypeOf, test } from "vitest";
 import { setupActivePinia } from "@ogw_tests/utils";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
 
+function sortByTitle(
+  itemA: Readonly<{ title: string }>,
+  itemB: Readonly<{ title: string }>,
+): number {
+  return itemA.title.localeCompare(itemB.title, undefined, {
+    numeric: true,
+    sensitivity: "base",
+  });
+}
+
 describe("treeview store state", () => {
   beforeEach(() => {
     setupActivePinia();
@@ -48,11 +58,11 @@ describe("treeview store actions", () => {
         testItem.viewer_type,
       );
       const itemsCopy = [...treeviewStore.items];
-      expect(treeviewStore.items).toStrictEqual(itemsCopy.toSorted());
+      expect(treeviewStore.items).toStrictEqual(itemsCopy.toSorted(sortByTitle));
 
       for (const item of treeviewStore.items) {
         const childrenCopy = [...item.children];
-        expect(item.children).toStrictEqual(childrenCopy.toSorted());
+        expect(item.children).toStrictEqual(childrenCopy.toSorted(sortByTitle));
       }
     }
     expect(treeviewStore.selection).toHaveLength(testItems.length);
diff --git a/tests/unit/stores/viewer.nuxt.test.ts b/tests/unit/stores/viewer.nuxt.test.ts
index 65291b2f..0143f564 100644
--- a/tests/unit/stores/viewer.nuxt.test.ts
+++ b/tests/unit/stores/viewer.nuxt.test.ts
@@ -10,21 +10,35 @@ import { setupActivePinia } from "@ogw_tests/utils";
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
+interface MockLock {
+  name: string;
+}
+
 // Mock navigator.locks API
 const mockLockRequest = vi
   .fn()
-  .mockImplementation(async (name, handler) => await handler({ name }));
+  .mockImplementation((name: string, handler: (lock: MockLock) => unknown) => handler({ name }));
 
+// The store only ever calls `navigator.locks.request`, and `vi.stubGlobal`
+// Accepts an `unknown` value, so a minimal stub (rather than spreading or
+// Mutating the real, getter-only `navigator` instance) is enough and needs
+// No type assertion.
 vi.stubGlobal("navigator", {
-  ...navigator,
   locks: {
     request: mockLockRequest,
   },
 });
 
+const TIMEOUT = 5000;
+
 describe("viewer store", () => {
   beforeAll(() => {
-    globalThis.WebSocket = WebSocket as unknown as typeof globalThis.WebSocket;
+    // The `ws` package's WebSocket class implements the same runtime behaviour
+    // The store relies on in a Node test environment, but TypeScript sees it as
+    // A structurally different class from the DOM lib's global WebSocket type,
+    // So it is stubbed through vitest's helper (typed to accept `unknown`)
+    // Instead of an unsafe type assertion.
+    vi.stubGlobal("WebSocket", WebSocket);
   });
 
   beforeEach(() => {
@@ -36,129 +50,189 @@ describe("viewer store", () => {
   });
 
   describe("state", () => {
-    test("initial state", () => {
-      const viewerStore = useViewerStore();
-      expectTypeOf(viewerStore.default_local_port).toBeString();
-      expect(viewerStore.client).toStrictEqual({});
-      expectTypeOf(viewerStore.picking_mode).toBeBoolean();
-      expectTypeOf(viewerStore.picked_point).toEqualTypeOf<{
-        x: number | undefined;
-        y: number | undefined;
-        z: number | undefined;
-      }>();
-      expectTypeOf(viewerStore.picked_point.x).toEqualTypeOf<number | undefined>();
-      expectTypeOf(viewerStore.status).toBeString();
-    });
+    test(
+      "initial state",
+      () => {
+        const viewerStore = useViewerStore();
+        expectTypeOf(viewerStore.default_local_port).toBeString();
+        expect(viewerStore.client).toStrictEqual({});
+        expectTypeOf(viewerStore.picking_mode).toBeBoolean();
+        expectTypeOf(viewerStore.picked_point).toEqualTypeOf<{
+          x: number | undefined;
+          y: number | undefined;
+          z: number | undefined;
+        }>();
+        expectTypeOf(viewerStore.picked_point.x).toEqualTypeOf<number | undefined>();
+        expectTypeOf(viewerStore.status).toBeString();
+      },
+      TIMEOUT,
+    );
   });
 
   describe("getters", () => {
     describe("protocol", () => {
-      test("app_mode CLOUD", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.CLOUD;
-        expect(viewerStore.protocol).toBe("wss");
-      });
-
-      test("app_mode BROWSER", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.BROWSER;
-        expect(viewerStore.protocol).toBe("ws");
-      });
-
-      test("app_mode DESKTOP", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.DESKTOP;
-        expect(viewerStore.protocol).toBe("ws");
-      });
+      test(
+        "app_mode CLOUD",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.CLOUD;
+          expect(viewerStore.protocol).toBe("wss");
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "app_mode BROWSER",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.BROWSER;
+          expect(viewerStore.protocol).toBe("ws");
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "app_mode DESKTOP",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.DESKTOP;
+          expect(viewerStore.protocol).toBe("ws");
+        },
+        TIMEOUT,
+      );
     });
 
     describe("port", () => {
-      test("app_mode CLOUD", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.CLOUD;
-        expect(viewerStore.port).toBe("443");
-      });
-
-      test("app_mode BROWSER", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.BROWSER;
-        expect(viewerStore.port).toBe(viewerStore.default_local_port);
-      });
-
-      test("app_mode DESKTOP", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.DESKTOP;
-        expect(viewerStore.port).toBe(viewerStore.default_local_port);
-      });
-
-      test("override default_local_port", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.DESKTOP;
-        viewerStore.default_local_port = "8080";
-        expect(viewerStore.port).toBe("8080");
-      });
+      test(
+        "app_mode CLOUD",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.CLOUD;
+          expect(viewerStore.port).toBe("443");
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "app_mode BROWSER",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.BROWSER;
+          expect(viewerStore.port).toBe(viewerStore.default_local_port);
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "app_mode DESKTOP",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.DESKTOP;
+          expect(viewerStore.port).toBe(viewerStore.default_local_port);
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "override default_local_port",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.DESKTOP;
+          viewerStore.default_local_port = "8080";
+          expect(viewerStore.port).toBe("8080");
+        },
+        TIMEOUT,
+      );
     });
     describe("base_url", () => {
-      test("app_mode DESKTOP", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.DESKTOP;
-        infraStore.domain_name = "localhost";
-        expect(viewerStore.base_url).toBe("ws://localhost:1234/ws");
-      });
-
-      test("app_mode CLOUD", () => {
-        const infraStore = useInfraStore();
-        const viewerStore = useViewerStore();
-        infraStore.app_mode = appMode.CLOUD;
-        infraStore.domain_name = "example.com";
-        expect(viewerStore.base_url).toBe("wss://example.com:443/viewer/ws");
-      });
+      test(
+        "app_mode DESKTOP",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.DESKTOP;
+          infraStore.domain_name = "localhost";
+          expect(viewerStore.base_url).toBe("ws://localhost:1234/ws");
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "app_mode CLOUD",
+        () => {
+          const infraStore = useInfraStore();
+          const viewerStore = useViewerStore();
+          infraStore.app_mode = appMode.CLOUD;
+          infraStore.domain_name = "example.com";
+          expect(viewerStore.base_url).toBe("wss://example.com:443/viewer/ws");
+        },
+        TIMEOUT,
+      );
     });
     describe("is_busy", () => {
-      test("is_busy", () => {
-        const viewerStore = useViewerStore();
-        viewerStore.request_counter = 1;
-        expect(viewerStore.is_busy).toBe(true);
-      });
-
-      test("not is_busy", () => {
-        const viewerStore = useViewerStore();
-        viewerStore.request_counter = 0;
-        expect(viewerStore.is_busy).toBe(false);
-      });
+      test(
+        "is_busy",
+        () => {
+          const viewerStore = useViewerStore();
+          viewerStore.request_counter = 1;
+          expect(viewerStore.is_busy).toBe(true);
+        },
+        TIMEOUT,
+      );
+
+      test(
+        "not is_busy",
+        () => {
+          const viewerStore = useViewerStore();
+          viewerStore.request_counter = 0;
+          expect(viewerStore.is_busy).toBe(false);
+        },
+        TIMEOUT,
+      );
     });
   });
   describe("actions", () => {
     describe("toggle_picking_mode", () => {
-      test("true", async () => {
-        const viewerStore = useViewerStore();
-        await viewerStore.toggle_picking_mode(true);
-        expect(viewerStore.picking_mode).toBe(true);
-      });
+      test(
+        "true",
+        () => {
+          const viewerStore = useViewerStore();
+          viewerStore.toggle_picking_mode(true);
+          expect(viewerStore.picking_mode).toBe(true);
+        },
+        TIMEOUT,
+      );
     });
 
     describe("start_request", () => {
-      test("increment", async () => {
-        const viewerStore = useViewerStore();
-        await viewerStore.start_request();
-        expect(viewerStore.request_counter).toBe(1);
-      });
+      test(
+        "increment",
+        () => {
+          const viewerStore = useViewerStore();
+          viewerStore.start_request();
+          expect(viewerStore.request_counter).toBe(1);
+        },
+        TIMEOUT,
+      );
     });
 
     describe("stop_request", () => {
-      test("decrement", async () => {
-        const viewerStore = useViewerStore();
-        await viewerStore.stop_request();
-        expect(viewerStore.request_counter).toBe(-1);
-      });
+      test(
+        "decrement",
+        () => {
+          const viewerStore = useViewerStore();
+          viewerStore.stop_request();
+          expect(viewerStore.request_counter).toBe(-1);
+        },
+        TIMEOUT,
+      );
     });
   });
 });
diff --git a/tests/unit/utils/validate_schema.nuxt.test.ts b/tests/unit/utils/validate_schema.nuxt.test.ts
index a43d3554..d2bd2aab 100644
--- a/tests/unit/utils/validate_schema.nuxt.test.ts
+++ b/tests/unit/utils/validate_schema.nuxt.test.ts
@@ -8,6 +8,7 @@ import { validateSchema } from "@ogw_shared/utils/validate_schema";
 const MIN_0 = 0;
 const MAX_10 = 10;
 const VAL_5 = 5;
+const TIMEOUT_MS = 5000;
 
 describe("validate schema", () => {
   const schema = {
@@ -22,17 +23,25 @@ describe("validate schema", () => {
     additionalProperties: false,
   };
 
-  test("ajv wrong params", () => {
-    const params = {};
-    const { valid, error } = validateSchema(schema, params);
-    expect(valid).toBe(false);
-    expect(error).toBe("data must have required property 'var_1'");
-  });
+  test(
+    "ajv wrong params",
+    () => {
+      const params = {};
+      const { valid, error } = validateSchema(schema, params);
+      expect(valid).toBe(false);
+      expect(error).toBe("data must have required property 'var_1'");
+    },
+    TIMEOUT_MS,
+  );
 
-  test("good params", () => {
-    const params = { var_1: "test", var_2: VAL_5 };
-    const { valid, error } = validateSchema(schema, params);
-    expect(valid).toBe(true);
-    expect(error).toBe("No errors");
-  });
+  test(
+    "good params",
+    () => {
+      const params = { var_1: "test", var_2: VAL_5 };
+      const { valid, error } = validateSchema(schema, params);
+      expect(valid).toBe(true);
+      expect(error).toBe("No errors");
+    },
+    TIMEOUT_MS,
+  );
 });
diff --git a/tests/utils.ts b/tests/utils.ts
index ef8b6482..e9696d91 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -1,6 +1,7 @@
 // Third party imports
 import * as components from "vuetify/components";
 import * as directives from "vuetify/directives";
+import type { HTTPMethod } from "h3";
 import { createTestingPinia } from "@pinia/testing";
 import { createVuetify } from "vuetify";
 import { setActivePinia } from "pinia";
@@ -8,7 +9,7 @@ import { vi } from "vitest";
 
 const vuetify = createVuetify({ components, directives });
 
-function setupActivePinia() {
+function setupActivePinia(): ReturnType<typeof createTestingPinia> {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -17,4 +18,39 @@ function setupActivePinia() {
   return pinia;
 }
 
-export { setupActivePinia, vuetify };
+const HTTP_METHODS: readonly HTTPMethod[] = [
+  "GET",
+  "HEAD",
+  "PATCH",
+  "POST",
+  "PUT",
+  "CONNECT",
+  "DELETE",
+  "OPTIONS",
+  "TRACE",
+];
+
+function isHTTPMethod(method: string): method is HTTPMethod {
+  return (HTTP_METHODS as readonly string[]).includes(method);
+}
+
+// Narrows a schema's method string down to `HTTPMethod` through a real runtime check instead of an unsafe type assertion.
+function toHTTPMethod(method: string | undefined): HTTPMethod {
+  if (method === undefined || !isHTTPMethod(method)) {
+    throw new Error(`Not a valid HTTP method: ${String(method)}`);
+  }
+  return method;
+}
+
+// Narrows a possibly-undefined value (e.g. an array index access) through a real runtime check instead of a non-null assertion.
+function assertDefined<TValue>(
+  value: TValue | undefined,
+  message = "Expected value to be defined",
+): TValue {
+  if (value === undefined) {
+    throw new Error(message);
+  }
+  return value;
+}
+
+export { setupActivePinia, vuetify, toHTTPMethod, assertDefined };
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index 4b34df15..00000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "./.nuxt/tsconfig.json"
-}
diff --git a/vuetify_nuxt_module.d.ts b/vuetify_nuxt_module.d.ts
new file mode 100644
index 00000000..8dc61d16
--- /dev/null
+++ b/vuetify_nuxt_module.d.ts
@@ -0,0 +1,11 @@
+// Vuetify-nuxt-module@1.0.0-rc.5 reads its options from the top-level `vuetify`
+// Key in nuxt.config.ts (see its `layer.config.vuetify?.moduleOptions` lookup),
+// But its own type declarations only augment `NuxtHooks`, not `NuxtConfig` -
+// This restores that missing augmentation.
+import type { ModuleOptions } from "vuetify-nuxt-module";
+
+declare module "@nuxt/schema" {
+  interface NuxtConfig {
+    vuetify?: ModuleOptions;
+  }
+}