From 8936920e7a29f81c06d437089b8ec9ec0d2c090a Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Sun, 21 Jun 2026 10:41:24 -0400
Subject: [PATCH 01/25] Stereo camera-file import/export, display, and length
 clearing

Add desktop import/export of stereo camera/calibration files via the annotation Import/Export buttons, display the loaded camera file in stereo mode, and clear 'length' attributes from tracks/detections when a new camera file loads (toggle in user settings). On import/upload, any VIAME-supported calibration is converted to the JSON camera format via convert_cam_format.py and stored with the dataset, keeping the original.
---
 client/dive-common/apispec.ts                 |  6 ++
 .../components/ImportAnnotations.vue          | 98 ++++++++++++++++++-
 .../components/UserSettingsDialog.vue         |  8 ++
 client/dive-common/store/settings.ts          |  8 ++
 .../utils/clearLengthAttributes.ts            | 35 +++++++
 client/platform/desktop/backend/ipcService.ts | 10 ++
 .../backend/native/calibrationConvert.ts      | 78 +++++++++++++++
 .../platform/desktop/backend/native/common.ts | 71 ++++++++++++++
 client/platform/desktop/frontend/api.ts       | 12 ++-
 .../desktop/frontend/components/Export.vue    | 46 ++++++++-
 .../frontend/components/ViewerLoader.vue      |  2 +
 .../desktop/frontend/store/dataset.ts         |  2 +
 12 files changed, 370 insertions(+), 6 deletions(-)
 create mode 100644 client/dive-common/utils/clearLengthAttributes.ts
 create mode 100644 client/platform/desktop/backend/native/calibrationConvert.ts

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index f3aad43c5..236ff3407 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -196,6 +196,8 @@ interface DatasetMeta extends DatasetMetaMutable {
   originalFps?: Readonly<number>;
   subType: Readonly<SubType>; // In future this could have stuff like IR/EO
   multiCamMedia: Readonly<MultiCamMedia | null>;
+  /** Stereo calibration / camera file currently associated with the dataset (desktop). */
+  calibration?: Readonly<string | null>;
 }
 
 interface Api {
@@ -257,6 +259,10 @@ interface Api {
   // Desktop-only calibration persistence functions
   getLastCalibration?(): Promise<string | null>;
   saveCalibration?(path: string): Promise<{ savedPath: string; updatedDatasetIds: string[] }>;
+  /** Desktop: set the stereo camera/calibration file for a single dataset. */
+  importCalibrationFile?(datasetId: string, path: string): Promise<{ calibration: string }>;
+  /** Desktop: copy the dataset's current camera/calibration file out to destPath. */
+  exportCalibrationFile?(datasetId: string, destPath: string): Promise<{ exportedPath: string }>;
 }
 const ApiSymbol = Symbol('api');
 
diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index c85786ea4..d5bc3ab74 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -1,9 +1,15 @@
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
+import {
+  computed, defineComponent, ref, PropType,
+} from 'vue';
 import { useApi } from 'dive-common/apispec';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
+import { clientSettings } from 'dive-common/store/settings';
+import clearLengthAttributes from 'dive-common/utils/clearLengthAttributes';
 import { cloneDeep } from 'lodash';
-import { useAnnotationSets, useAnnotationSet, useHandler } from 'vue-media-annotator/provides';
+import {
+  useAnnotationSets, useAnnotationSet, useHandler, useCameraStore,
+} from 'vue-media-annotator/provides';
 import { getResponseError } from 'vue-media-annotator/utils';
 
 export default defineComponent({
@@ -13,6 +19,14 @@ export default defineComponent({
       type: String,
       default: null,
     },
+    subType: {
+      type: String as PropType<string | null>,
+      default: null,
+    },
+    calibrationFile: {
+      type: String as PropType<string | null>,
+      default: null,
+    },
     blockOnUnsaved: {
       type: Boolean,
       default: false,
@@ -31,8 +45,19 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const { openFromDisk, importAnnotationFile } = useApi();
-    const { reloadAnnotations } = useHandler();
+    const api = useApi();
+    const { openFromDisk, importAnnotationFile } = api;
+    const { reloadAnnotations, save } = useHandler();
+    const cameraStore = useCameraStore();
+    // Camera/calibration file import is desktop-only (needs importCalibrationFile)
+    // and only meaningful for stereo datasets.
+    const cameraFileSupported = computed(
+      () => !!api.importCalibrationFile && props.subType === 'stereo',
+    );
+    const currentCalibrationName = computed(() => {
+      if (!props.calibrationFile) return '';
+      return props.calibrationFile.replace(/^.*[\\/]/, '');
+    });
     const sets = computed(() => {
       const data = useAnnotationSets();
       const temp = cloneDeep(data.value);
@@ -100,8 +125,38 @@ export default defineComponent({
         processing.value = false;
       }
     };
+    const openCalibrationUpload = async () => {
+      if (!api.importCalibrationFile) return;
+      try {
+        const ret = await openFromDisk('calibration');
+        if (ret.canceled || !ret.filePaths.length) return;
+        menuOpen.value = false;
+        processing.value = true;
+        await api.importCalibrationFile(props.datasetId, ret.filePaths[0]);
+        // A new camera file invalidates length measurements from the prior
+        // calibration; clear them when the option is enabled.
+        if (clientSettings.stereoSettings.clearLengthOnCameraFileLoad) {
+          const cleared = clearLengthAttributes(cameraStore);
+          if (cleared > 0) {
+            await save();
+          }
+        }
+        processing.value = false;
+        await reloadAnnotations();
+      } catch (error) {
+        processing.value = false;
+        prompt({
+          title: 'Camera File Import Failed',
+          text: [getResponseError(error)],
+          positiveButton: 'OK',
+        });
+      }
+    };
     return {
       openUpload,
+      openCalibrationUpload,
+      cameraFileSupported,
+      currentCalibrationName,
       processing,
       menuOpen,
       additive,
@@ -235,6 +290,41 @@ export default defineComponent({
             </div>
           </v-col>
         </v-container>
+        <template v-if="cameraFileSupported">
+          <v-divider />
+          <v-card-title class="pt-3">
+            Camera File
+          </v-card-title>
+          <v-card-text class="pb-0">
+            <div v-if="currentCalibrationName">
+              Loaded: <strong>{{ currentCalibrationName }}</strong>
+            </div>
+            <div
+              v-else
+              class="grey--text"
+            >
+              No camera file loaded.
+            </div>
+            <div class="caption pt-1">
+              Import any VIAME-supported stereo calibration; it is converted to the
+              JSON camera format and stored with the dataset.
+            </div>
+          </v-card-text>
+          <v-container>
+            <v-col>
+              <v-row>
+                <v-btn
+                  depressed
+                  block
+                  :disabled="!datasetId || processing"
+                  @click="openCalibrationUpload"
+                >
+                  Import Camera File
+                </v-btn>
+              </v-row>
+            </v-col>
+          </v-container>
+        </template>
       </v-card>
     </template>
   </v-menu>
diff --git a/client/dive-common/components/UserSettingsDialog.vue b/client/dive-common/components/UserSettingsDialog.vue
index 57da52aca..df4e19196 100644
--- a/client/dive-common/components/UserSettingsDialog.vue
+++ b/client/dive-common/components/UserSettingsDialog.vue
@@ -58,6 +58,14 @@ export default defineComponent({
           step="1"
           :disabled="!clientSettings.autoSaveSettings.enabled"
         />
+        <v-switch
+          v-model="clientSettings.stereoSettings.clearLengthOnCameraFileLoad"
+          color="primary"
+          class="my-0 mt-3"
+          label="Clear length attributes on camera-file load"
+          hint="When a new stereo camera/calibration file is loaded, remove stale 'length' measurements from all tracks and detections."
+          persistent-hint
+        />
       </v-card-text>
       <v-card-actions>
         <v-spacer />
diff --git a/client/dive-common/store/settings.ts b/client/dive-common/store/settings.ts
index d369b6264..b9637d9fd 100644
--- a/client/dive-common/store/settings.ts
+++ b/client/dive-common/store/settings.ts
@@ -67,6 +67,9 @@ interface AnnotationSettings {
     enabled: boolean;
     delaySeconds: number;
   };
+  stereoSettings: {
+    clearLengthOnCameraFileLoad: boolean;
+  };
 }
 
 const defaultSettings: AnnotationSettings = {
@@ -142,6 +145,11 @@ const defaultSettings: AnnotationSettings = {
     enabled: false, // Disabled by default for backward compatibility
     delaySeconds: 60,
   },
+  stereoSettings: {
+    // When a new stereo camera/calibration file is loaded, strip stale
+    // per-track/detection 'length' measurements derived from the old calibration.
+    clearLengthOnCameraFileLoad: true,
+  },
 };
 const MIN_AUTO_SAVE_DELAY_SECONDS = 10;
 
diff --git a/client/dive-common/utils/clearLengthAttributes.ts b/client/dive-common/utils/clearLengthAttributes.ts
new file mode 100644
index 000000000..11d3ea989
--- /dev/null
+++ b/client/dive-common/utils/clearLengthAttributes.ts
@@ -0,0 +1,35 @@
+import type { CameraStore, Track } from 'vue-media-annotator/index';
+
+export const LENGTH_ATTRIBUTE_KEY = 'length';
+
+/**
+ * Remove every per-track and per-detection attribute named 'length' across all
+ * cameras in the store. Used when a new stereo camera/calibration file is loaded,
+ * because existing length measurements were computed against the previous
+ * calibration and are no longer valid.
+ *
+ * Mutations go through the Track API so change-tracking and reactivity fire; the
+ * caller is responsible for persisting the result (e.g. handler.save()).
+ *
+ * @returns the number of attribute values cleared.
+ */
+export default function clearLengthAttributes(cameraStore: CameraStore): number {
+  let cleared = 0;
+  cameraStore.camMap.value.forEach((camera) => {
+    camera.trackStore.annotationMap.forEach((annotation) => {
+      const track = annotation as Track;
+      if (track.attributes && track.attributes[LENGTH_ATTRIBUTE_KEY] !== undefined) {
+        track.setAttribute(LENGTH_ATTRIBUTE_KEY, undefined);
+        cleared += 1;
+      }
+      track.features.forEach((feature, frame) => {
+        if (feature && feature.attributes
+          && feature.attributes[LENGTH_ATTRIBUTE_KEY] !== undefined) {
+          track.setFeatureAttribute(frame, LENGTH_ATTRIBUTE_KEY, undefined);
+          cleared += 1;
+        }
+      });
+    });
+  });
+  return cleared;
+}
diff --git a/client/platform/desktop/backend/ipcService.ts b/client/platform/desktop/backend/ipcService.ts
index e8793cdd3..beba25675 100644
--- a/client/platform/desktop/backend/ipcService.ts
+++ b/client/platform/desktop/backend/ipcService.ts
@@ -211,6 +211,16 @@ export default function register() {
     return { savedPath, updatedDatasetIds: updatedIds };
   });
 
+  ipcMain.handle('import-calibration', async (_, { id, path }: { id: string; path: string }) => {
+    const calibration = await common.setDatasetCalibration(settings.get(), id, path);
+    return { calibration };
+  });
+
+  ipcMain.handle('export-calibration', async (_, { id, destPath }: { id: string; destPath: string }) => {
+    const exportedPath = await common.exportDatasetCalibration(settings.get(), id, destPath);
+    return { exportedPath };
+  });
+
   ipcMain.handle('finalize-import', async (event, args: DesktopMediaImportResponse) => common.finalizeMediaImport(settings.get(), args));
 
   ipcMain.handle('convert', async (event, args: ConversionArgs) => {
diff --git a/client/platform/desktop/backend/native/calibrationConvert.ts b/client/platform/desktop/backend/native/calibrationConvert.ts
new file mode 100644
index 000000000..d821e6194
--- /dev/null
+++ b/client/platform/desktop/backend/native/calibrationConvert.ts
@@ -0,0 +1,78 @@
+/**
+ * Stereo camera calibration file handling for the desktop backend.
+ *
+ * VIAME ships a `convert_cam_format.py` tool (installed under
+ * `<viamePath>/configs/`) that reads any supported stereo calibration format
+ * (npz, opencv yml, matlab mat, zed, CamCAL, ...) and writes KWIVER's JSON
+ * camera-rig format. We normalize every imported calibration to that JSON so the
+ * measurement pipeline always consumes a single, consistent format, while still
+ * keeping the user's original file alongside the media.
+ */
+import npath from 'path';
+import { spawn } from 'child_process';
+import fs from 'fs-extra';
+
+import { Settings } from 'platform/desktop/constants';
+import { observeChild } from 'platform/desktop/backend/native/processManager';
+
+const ConvertToolRelativePath = npath.join('configs', 'convert_cam_format.py');
+
+/**
+ * Run VIAME's convert_cam_format.py to convert a calibration file to the
+ * KWIVER-compatible JSON camera-rig format.
+ * @returns true if the JSON file was produced, false if conversion was
+ *   unavailable (e.g. VIAME not configured) or failed.
+ */
+async function convertCalibrationToJson(
+  settings: Settings,
+  sourcePath: string,
+  destJsonPath: string,
+): Promise<boolean> {
+  const isWin = process.platform === 'win32';
+  const setupScript = npath.join(settings.viamePath, isWin ? 'setup_viame.bat' : 'setup_viame.sh');
+  const toolPath = npath.join(settings.viamePath, ConvertToolRelativePath);
+  if (!(await fs.pathExists(setupScript)) || !(await fs.pathExists(toolPath))) {
+    return false;
+  }
+  const sourceCmd = isWin ? `call "${setupScript}"` : `. "${setupScript}"`;
+  const command = `${sourceCmd} && python "${toolPath}" "${sourcePath}" "${destJsonPath}"`;
+  const child = observeChild(spawn(command, { shell: isWin ? true : '/bin/bash' }));
+  const exitCode: number | null = await new Promise((resolve) => {
+    child.on('exit', (code) => resolve(code));
+  });
+  const produced = await fs.pathExists(destJsonPath);
+  return exitCode === 0 && produced;
+}
+
+/**
+ * Store a stereo calibration / camera file alongside a dataset's media and
+ * normalize it to the JSON camera-rig format.
+ *
+ * The original file is always copied into the dataset directory (preserved).
+ * Non-JSON formats are additionally converted to JSON via VIAME; the JSON copy
+ * is used for pipelines when conversion succeeds, otherwise the original is used.
+ *
+ * @returns absolute path of the calibration file the dataset should reference.
+ */
+async function prepareDatasetCalibration(
+  settings: Settings,
+  projectDirAbsPath: string,
+  sourcePath: string,
+): Promise<string> {
+  const originalDest = npath.join(projectDirAbsPath, npath.basename(sourcePath));
+  if (npath.resolve(originalDest) !== npath.resolve(sourcePath)) {
+    await fs.copy(sourcePath, originalDest, { overwrite: true });
+  }
+  if (npath.extname(originalDest).toLowerCase() === '.json') {
+    return originalDest;
+  }
+  const base = npath.basename(originalDest, npath.extname(originalDest));
+  const jsonDest = npath.join(projectDirAbsPath, `${base}.json`);
+  const converted = await convertCalibrationToJson(settings, originalDest, jsonDest);
+  return converted ? jsonDest : originalDest;
+}
+
+export {
+  convertCalibrationToJson,
+  prepareDatasetCalibration,
+};
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 6d37a69ea..48ba46a89 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -55,6 +55,7 @@ import { upgrade } from './migrations';
 // TODO:  Check to Refactor this
 // eslint-disable-next-line import/no-cycle
 import { getMultiCamUrls, transcodeMultiCam } from './multiCamUtils';
+import { prepareDatasetCalibration } from './calibrationConvert';
 import { splitExt } from './utils';
 
 const AuxFolderName = 'auxiliary';
@@ -1415,6 +1416,16 @@ async function finalizeMediaImport(
   jsonMeta.id = `${cleanString(jsonMeta.name).substr(0, 20)}_${makeid(10)}`;
   const projectDirAbsPath = await _initializeProjectDir(settings, jsonMeta);
 
+  // Store any stereo calibration / camera file alongside the media and normalize
+  // it to the VIAME JSON camera-rig format (keeping the original).
+  if (jsonMeta.multiCam?.calibration) {
+    jsonMeta.multiCam.calibration = await prepareDatasetCalibration(
+      settings,
+      projectDirAbsPath,
+      jsonMeta.multiCam.calibration,
+    );
+  }
+
   // Filter all parts of the input based on glob pattern
   if (globPattern && jsonMeta.type === 'image-sequence') {
     const searchPath = jsonMeta.imageListPath || jsonMeta.originalBasePath;
@@ -1642,6 +1653,63 @@ async function datasetHasCalibrationFile(settings: Settings, datasetId: string):
   }
 }
 
+/**
+ * Get the calibration / camera file path currently associated with a dataset.
+ */
+async function getDatasetCalibrationPath(
+  settings: Settings,
+  datasetId: string,
+): Promise<string | null> {
+  const projectDirInfo = await getValidatedProjectDir(settings, datasetId);
+  const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
+  return fullMeta.multiCam?.calibration ?? null;
+}
+
+/**
+ * Set the stereo camera/calibration file for a single dataset. The source file is
+ * copied into the dataset's project directory and recorded in multiCam.calibration.
+ * @returns absolute path of the calibration file now associated with the dataset
+ */
+async function setDatasetCalibration(
+  settings: Settings,
+  datasetId: string,
+  sourcePath: string,
+): Promise<string> {
+  const projectDirInfo = await getValidatedProjectDir(settings, datasetId);
+  const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
+  if (!fullMeta.multiCam) {
+    throw new Error(`Dataset ${datasetId} is not a multi-camera/stereo dataset; cannot set a calibration file.`);
+  }
+  const calibrationPath = await prepareDatasetCalibration(
+    settings,
+    projectDirInfo.basePath,
+    sourcePath,
+  );
+  fullMeta.multiCam.calibration = calibrationPath;
+  await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
+  return calibrationPath;
+}
+
+/**
+ * Copy a dataset's current camera/calibration file out to destPath.
+ * @returns the destination path written
+ */
+async function exportDatasetCalibration(
+  settings: Settings,
+  datasetId: string,
+  destPath: string,
+): Promise<string> {
+  const calibrationPath = await getDatasetCalibrationPath(settings, datasetId);
+  if (!calibrationPath) {
+    throw new Error(`Dataset ${datasetId} has no camera/calibration file to export.`);
+  }
+  if (!(await fs.pathExists(calibrationPath))) {
+    throw new Error(`Calibration file for dataset ${datasetId} no longer exists on disk: ${calibrationPath}`);
+  }
+  await fs.copy(calibrationPath, destPath, { overwrite: true });
+  return destPath;
+}
+
 export {
   ProjectsFolderName,
   JobsFolderName,
@@ -1681,4 +1749,7 @@ export {
   saveLastCalibration,
   applyCalibrationToUncalibratedStereoDatasets,
   datasetHasCalibrationFile,
+  getDatasetCalibrationPath,
+  setDatasetCalibration,
+  exportDatasetCalibration,
 };
diff --git a/client/platform/desktop/frontend/api.ts b/client/platform/desktop/frontend/api.ts
index 29b48c42c..9aa40d936 100644
--- a/client/platform/desktop/frontend/api.ts
+++ b/client/platform/desktop/frontend/api.ts
@@ -317,7 +317,7 @@ function getTileURL(itemId: string, x: number, y: number, level: number, query:
 async function loadMetadata(id: string) {
   const client = await getClient();
   const { data } = await client.get<DesktopMetadata>(`dataset/${id}/meta`);
-  return data;
+  return { ...data, calibration: data.multiCam?.calibration ?? null };
 }
 
 async function loadDetections(datasetId: string) {
@@ -358,6 +358,14 @@ function saveCalibration(path: string): Promise<{ savedPath: string; updatedData
   return window.diveDesktop.invoke('save-calibration', { path });
 }
 
+function importCalibrationFile(datasetId: string, path: string): Promise<{ calibration: string }> {
+  return window.diveDesktop.invoke('import-calibration', { id: datasetId, path });
+}
+
+function exportCalibrationFile(datasetId: string, destPath: string): Promise<{ exportedPath: string }> {
+  return window.diveDesktop.invoke('export-calibration', { id: datasetId, destPath });
+}
+
 export {
   /* Standard Specification APIs */
   loadMetadata,
@@ -396,4 +404,6 @@ export {
   cancelJob,
   getLastCalibration,
   saveCalibration,
+  importCalibrationFile,
+  exportCalibrationFile,
 };
diff --git a/client/platform/desktop/frontend/components/Export.vue b/client/platform/desktop/frontend/components/Export.vue
index f05f1e516..7e5e6aa8e 100644
--- a/client/platform/desktop/frontend/components/Export.vue
+++ b/client/platform/desktop/frontend/components/Export.vue
@@ -5,7 +5,9 @@ import {
 
 import { usePendingSaveCount, useHandler, useTrackFilters } from 'vue-media-annotator/provides';
 import AutosavePrompt from 'dive-common/components/AutosavePrompt.vue';
-import { loadMetadata, exportDataset, exportConfiguration } from 'platform/desktop/frontend/api';
+import {
+  loadMetadata, exportDataset, exportConfiguration, exportCalibrationFile,
+} from 'platform/desktop/frontend/api';
 import type { JsonMeta } from 'platform/desktop/constants';
 
 export default defineComponent({
@@ -54,6 +56,29 @@ export default defineComponent({
         ? Object.keys(data.meta.confidenceFilters || {})
         : []));
 
+    const calibrationFile = computed(() => data.meta?.multiCam?.calibration ?? null);
+    const cameraFileSupported = computed(
+      () => data.meta?.subType === 'stereo' && !!calibrationFile.value,
+    );
+
+    async function exportCameraFile() {
+      if (!calibrationFile.value) return;
+      const calName = calibrationFile.value.replace(/^.*[\\/]/, '');
+      const location = await window.diveDesktop.showSaveDialog({
+        title: 'Export Camera File',
+        defaultPath: calName,
+      });
+      if (location.canceled || !location.filePath) return;
+      try {
+        data.err = null;
+        await exportCalibrationFile(props.id, location.filePath);
+        data.outPath = location.filePath;
+      } catch (err) {
+        data.err = err;
+        throw err;
+      }
+    }
+
     async function doExport({ type, forceSave = false }: { type: 'dataset' | 'configuration' | 'trackJSON' | 'coco'; forceSave?: boolean}) {
       if (pendingSaveCount.value > 0 && forceSave) {
         await save();
@@ -87,6 +112,9 @@ export default defineComponent({
     return {
       data,
       doExport,
+      exportCameraFile,
+      cameraFileSupported,
+      calibrationFile,
       savePrompt,
       thresholds,
       checkedTypes,
@@ -255,6 +283,22 @@ export default defineComponent({
             Configuration
           </v-btn>
         </v-card-actions>
+        <template v-if="cameraFileSupported">
+          <v-card-text class="pb-0">
+            Export the stereo camera / calibration file currently associated
+            with this dataset.
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer />
+            <v-btn
+              depressed
+              block
+              @click="exportCameraFile"
+            >
+              Camera File
+            </v-btn>
+          </v-card-actions>
+        </template>
       </v-card>
     </template>
   </v-menu>
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index 141c49bac..80ba6c127 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -175,6 +175,8 @@ export default defineComponent({
       />
       <ImportAnnotations
         :dataset-id="modifiedId"
+        :sub-type="subTypeList[0]"
+        :calibration-file="datasets[id] && datasets[id].calibration"
         v-bind="{ buttonOptions, menuOptions, readOnlyMode }"
         block-on-unsaved
       />
diff --git a/client/platform/desktop/frontend/store/dataset.ts b/client/platform/desktop/frontend/store/dataset.ts
index 6947656c0..beb92f4d9 100644
--- a/client/platform/desktop/frontend/store/dataset.ts
+++ b/client/platform/desktop/frontend/store/dataset.ts
@@ -25,6 +25,7 @@ export interface JsonMetaCache {
   transcodedVideoFile?: string;
   subType: SubType;
   cameraNumber: number;
+  calibration?: string | null;
 }
 
 /**
@@ -62,6 +63,7 @@ function setRecents(meta: JsonMeta, accessTime?: string) {
     subType: meta.subType,
     error: meta.error,
     cameraNumber: Object.keys(meta.multiCam?.cameras || {}).length,
+    calibration: meta.multiCam?.calibration ?? null,
   } as JsonMetaCache);
   const values = Object.values(datasets.value);
   window.localStorage.setItem(RecentsKey, JSON.stringify(values));

From 9238dd04a09d4c421c02379e6954797950e74582 Mon Sep 17 00:00:00 2001
From: Louis Pagnier <louis.pagnier@kitware.com>
Date: Thu, 25 Jun 2026 11:34:06 +0200
Subject: [PATCH 02/25] Start calibration menu

(cherry picked from commit 48b84de0dbf2fff7f3ac73e56103dc71ff248e99)
---
 client/dive-common/apispec.ts                 |   1 +
 .../components/CalibrationDialog.vue          | 156 ++++++++++++++++++
 .../components/CalibrationMenu.vue            |  83 ++++++++++
 .../components/RunPipelineToast.vue           |   2 +
 client/dive-common/components/Viewer.vue      |  32 +++-
 client/platform/web-girder/App.vue            |   2 +
 client/platform/web-girder/api/rpc.service.ts |   7 +
 server/dive_server/crud_rpc.py                |  30 ++++
 server/dive_server/views_rpc.py               |  21 +++
 9 files changed, 332 insertions(+), 2 deletions(-)
 create mode 100644 client/dive-common/components/CalibrationDialog.vue
 create mode 100644 client/dive-common/components/CalibrationMenu.vue

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index 236ff3407..6a14ff3e6 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -205,6 +205,7 @@ interface Api {
   runPipeline(itemId: string, pipeline: Pipe, pipelineParams?: PipelineParams): Promise<unknown>;
   deleteTrainedPipeline(pipeline: Pipe): Promise<void>;
   exportTrainedPipeline(path: string, pipeline: Pipe): Promise<unknown>;
+  getDatasetCalibration(datasetId: string): Promise<unknown>;
 
   getTrainingConfigurations(): Promise<TrainingConfigs>;
   runTraining(
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
new file mode 100644
index 000000000..5e4ccfb7f
--- /dev/null
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -0,0 +1,156 @@
+<script lang="ts">
+import {
+  defineComponent,
+  PropType,
+  ref,
+  watch,
+} from 'vue';
+
+export default defineComponent({
+  name: 'CalibrationDialog',
+  props: {
+    value: { type: Boolean, required: true },
+    calibration: { type: Object, default: null },
+  },
+  setup(props, { emit }) {
+    const close = () => emit('input', false);
+
+    return {
+      close,
+    };
+  },
+});
+</script>
+
+<template>
+  <v-dialog
+    :value="value"
+    max-width="600px"
+    scrollable
+    @input="$emit('input', $event)"
+  >
+    <v-card v-if="calibration" class="rounded-lg">
+      <v-toolbar flat color="primary" dark dense>
+        <v-icon left>
+          mdi-checkerboard
+        </v-icon>
+        <v-toolbar-title class="text-h6">
+          Cameras calibration
+        </v-toolbar-title>
+        <v-spacer />
+        <v-btn icon small @click="close">
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-toolbar>
+
+      <v-card-text class="pa-4">
+        <div class="mb-6">
+          <div class="text-subtitle-1 font-weight-bold mb-2">General</div>
+          <v-simple-table dense class="mb-4 elevation-1">
+            <template v-slot:default>
+              <thead>
+                <tr>
+                  <th class="text-left">Parameter</th>
+                  <th class="text-left">Value</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr><td>Image resolution</td><td>{{ calibration.image_width }} x {{ calibration.image_height }} px</td></tr>
+                <tr><td>Calibration grid</td><td>{{ calibration.grid_width }} x {{ calibration.grid_height }}</td></tr>
+                <tr><td>Square size</td><td>{{ calibration.square_size_mm }} mm</td></tr>
+                <tr><td>Stereo RMS Error</td><td>{{ calibration.rms_error_stereo }}</td></tr>
+              </tbody>
+            </template>
+          </v-simple-table>
+
+          <div class="text-subtitle-1 font-weight-bold mb-2">Intrinsics</div>
+          <v-simple-table dense class="mb-4 elevation-1">
+            <template v-slot:default>
+              <thead>
+                <tr>
+                  <th class="text-left">Property</th>
+                  <th class="text-left">Left Camera</th>
+                  <th class="text-left">Right Camera</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td><strong>Focal (fx, fy)</strong></td>
+                  <td>{{ calibration.fx_left }} , {{ calibration.fy_left }}</td>
+                  <td>{{ calibration.fx_right }} , {{ calibration.fy_right }}</td>
+                </tr>
+                <tr>
+                  <td><strong>Optical center (cx, cy)</strong></td>
+                  <td>{{ calibration.cx_left }} , {{ calibration.cy_left }}</td>
+                  <td>{{ calibration.cx_right }} , {{ calibration.cy_right }}</td>
+                </tr>
+                <tr>
+                  <td><strong>Radial Distortion (k1, k2, k3)</strong></td>
+                  <td>{{ calibration.k1_left }} , {{ calibration.k2_left }} , {{ calibration.k3_left }}</td>
+                  <td>{{ calibration.k1_right }} , {{ calibration.k2_right }} , {{ calibration.k3_right }}</td>
+                </tr>
+                <tr>
+                  <td><strong>Tangential Distortion (p1, p2)</strong></td>
+                  <td>{{ calibration.p1_left }} , {{ calibration.p2_left }}</td>
+                  <td>{{ calibration.p1_right }} , {{ calibration.p2_right }}</td>
+                </tr>
+                <tr>
+                  <td><strong>RMS Error</strong></td>
+                  <td>{{ calibration.rms_error_left }}</td>
+                  <td>{{ calibration.rms_error_right }}</td>
+                </tr>
+              </tbody>
+            </template>
+          </v-simple-table>
+          
+          <div class="text-subtitle-1 font-weight-bold mb-2">Extrinsics</div>
+          <v-row>
+            <v-col cols="12" md="6">
+              <v-card outlined class="pa-2 text-caption font-mono">
+                <div class="font-weight-bold mb-1">Translation T (mm):</div>
+                X: {{ calibration.T[0] }}<br>
+                Y: {{ calibration.T[1] }}<br>
+                Z: {{ calibration.T[2] }}
+              </v-card>
+            </v-col>
+            <v-col cols="12" md="6">
+              <v-card outlined class="pa-2 text-caption font-mono">
+                <div class="font-weight-bold mb-1">Rotation R:</div>
+                [{{ calibration.R[0].toFixed(4) }}, {{ calibration.R[1].toFixed(4) }}, {{ calibration.R[2].toFixed(4) }}]<br>
+                [{{ calibration.R[3].toFixed(4) }}, {{ calibration.R[4].toFixed(4) }}, {{ calibration.R[5].toFixed(4) }}]<br>
+                [{{ calibration.R[6].toFixed(4) }}, {{ calibration.R[7].toFixed(4) }}, {{ calibration.R[8].toFixed(4) }}]
+              </v-card>
+            </v-col>
+          </v-row>
+        </div>
+      </v-card-text>
+
+      <v-divider />
+
+      <v-card-actions class="pa-4 lighten-3">
+        <v-btn text color="grey darken-1" @click="close">
+          Cancel
+        </v-btn>
+        <v-spacer />
+        <v-btn color="red" outlined @click="close">
+          <v-icon left>
+            mdi-delete-outline
+          </v-icon>
+          Delete
+        </v-btn>
+        <v-btn color="primary" outlined @click="close">
+          <v-icon left>
+            mdi-upload
+          </v-icon>
+          Import
+        </v-btn>
+        <v-btn color="primary" @click="close">
+          <v-icon left>
+            mdi-download
+          </v-icon>
+          Download
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
new file mode 100644
index 000000000..d4ff6161d
--- /dev/null
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -0,0 +1,83 @@
+<script lang="ts">
+import {
+  defineComponent,
+  ref,
+} from 'vue';
+
+import {
+  useApi,
+} from 'dive-common/apispec';
+
+import CalibrationDialog from './CalibrationDialog.vue';
+
+export default defineComponent({
+  name: 'CalibrationMenu',
+  props: {
+    datasetId: { type: String, required: true },
+  },
+  components: {
+    CalibrationDialog,
+  },
+  setup(props) {
+    const showCalibrationDialog = ref(false);
+    const calibration = ref({});
+
+    const { getDatasetCalibration } = useApi();
+
+    getDatasetCalibration(props.datasetId).then((res) => {
+      calibration.value = res;
+    })
+
+    return {
+      showCalibrationDialog,
+      calibration
+    };
+  },
+});
+</script>
+
+<template>
+  <div>
+    <v-tooltip
+      bottom
+      :z-index="20">
+      <template #activator="{ on }">
+      <v-btn
+        color=""
+        class="calibration-icon mx-1 mode-button"
+        :class="{ 'not-calibrated': !calibration }"
+        small
+        v-on="on"
+        @click="showCalibrationDialog = true"
+      >
+        <v-icon>mdi-checkerboard</v-icon>
+      </v-btn>
+      </template>
+      <span>Cameras calibration</span>
+    </v-tooltip>
+
+    <CalibrationDialog
+      v-model="showCalibrationDialog"
+      :calibration="calibration"
+    />
+  </div>
+</template>
+
+<style>
+.calibration-icon {
+  border-width: 1px;
+  padding: 3px;
+  font-size: 1.2em !important;
+  margin-top: -4px;
+}
+
+.not-calibrated {
+  border-color: orange !important;
+  color: orange !important;
+}
+
+.mode-button {
+  border: 1px solid grey;
+  min-width: 36px;
+}
+</style>
\ No newline at end of file
diff --git a/client/dive-common/components/RunPipelineToast.vue b/client/dive-common/components/RunPipelineToast.vue
index 53c8bbcbe..e24c141f8 100644
--- a/client/dive-common/components/RunPipelineToast.vue
+++ b/client/dive-common/components/RunPipelineToast.vue
@@ -35,6 +35,8 @@ export default defineComponent({
           return 'mdi-vector-polygon';
         case 'TRACK':
           return 'mdi-gesture';
+        case 'CALIBRATION':
+          return 'mdi-checkerboard';
         default:
           return type;
       }
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 4b60ed02d..9ef008a1d 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -64,6 +64,7 @@ import MultiCamToolsVue from './MultiCamTools.vue';
 import MultiCamToolbar from './MultiCamToolbar.vue';
 import PrimaryAttributeTrackFilter from './PrimaryAttributeTrackFilter.vue';
 import UserSettingsDialog from './UserSettingsDialog.vue';
+import CalibrationMenu from './CalibrationMenu.vue';
 
 export interface ImageDataItem {
   url: string;
@@ -86,6 +87,7 @@ export default defineComponent({
     UserGuideButton,
     UserSettingsDialog,
     EditorMenu,
+    CalibrationMenu,
     MultiCamToolbar,
     PrimaryAttributeTrackFilter,
     TrackList,
@@ -1212,6 +1214,7 @@ export default defineComponent({
       showConfidenceFirst,
       showTrackAttributesFirst,
       attributes,
+      datasetId,
       /* Attribute editing for bottom panel */
       editIndividual,
       editingAttribute,
@@ -1386,17 +1389,38 @@ export default defineComponent({
           :value="selectedCamera"
           :items="multiCamList"
           label="Camera"
-          class="shrink"
-          style="width: 180px;"
+          class="mx-1 shrink camera-select"
+          style="width: 180px; font-size: 0.9em"
           outlined
           hide-details
           dense
+          variant="default"
           @change="changeCamera"
         >
           <template #item="{ item }">
             {{ item }} {{ item === defaultCamera ? '(Default)' : '' }}
           </template>
         </v-select>
+
+        <CalibrationMenu :dataset-id="datasetId" v-if="showMultiCamToolbar && multiCamList.length > 1"></CalibrationMenu>
+
+        <!-- <v-tooltip v-if="showMultiCamToolbar && multiCamList.length > 1"
+          bottom
+          :z-index="20">
+          <template #activator="{ on }">
+            <v-btn
+              color=""
+              class="calibration-icon mx-1 mode-button"
+              :class="{ 'not-calibrated': true }"
+              small
+              v-on="on"
+            >
+              <v-icon>mdi-checkerboard</v-icon>
+            </v-btn>
+          </template>
+          <span>Cameras calibration</span>
+        </v-tooltip> -->
+
         <v-divider
           vertical
           class="mx-2"
@@ -1806,4 +1830,8 @@ html {
   color: white;
 }
 
+.camera-select fieldset {
+  height: 33px;
+  margin-top: 4px;
+}
 </style>
diff --git a/client/platform/web-girder/App.vue b/client/platform/web-girder/App.vue
index fbaaf0c11..7245b42b9 100644
--- a/client/platform/web-girder/App.vue
+++ b/client/platform/web-girder/App.vue
@@ -16,6 +16,7 @@ import {
   deleteTrainedPipeline,
   runPipeline,
   exportTrainedPipeline,
+  getDatasetCalibration,
   getTrainingConfigurations,
   runTraining,
   saveMetadata,
@@ -57,6 +58,7 @@ export default defineComponent({
       deleteTrainedPipeline: unwrap(deleteTrainedPipeline),
       runPipeline: unwrap(runPipeline),
       exportTrainedPipeline: unwrap(exportTrainedPipeline),
+      getDatasetCalibration: unwrap(getDatasetCalibration),
       getTrainingConfigurations: unwrap(getTrainingConfigurations),
       runTraining: unwrap(runTraining),
       loadDetections,
diff --git a/client/platform/web-girder/api/rpc.service.ts b/client/platform/web-girder/api/rpc.service.ts
index 7bc6ac109..7dec3d8c8 100644
--- a/client/platform/web-girder/api/rpc.service.ts
+++ b/client/platform/web-girder/api/rpc.service.ts
@@ -54,6 +54,12 @@ function exportTrainedPipeline(path: string, pipeline: Pipe) {
   });
 }
 
+function getDatasetCalibration(datasetId: string) {
+  return girderRest.get('dive_rpc/calibration', {
+    params: {folderId: datasetId}
+  });
+}
+
 function convertLargeImage(folderId: string) {
   return girderRest.post(`dive_rpc/convert_large_image/${folderId}`, null, {});
 }
@@ -65,4 +71,5 @@ export {
   runTraining,
   deleteTrainedPipeline,
   exportTrainedPipeline,
+  getDatasetCalibration,
 };
diff --git a/server/dive_server/crud_rpc.py b/server/dive_server/crud_rpc.py
index 0c84143d4..1a0e7f426 100644
--- a/server/dive_server/crud_rpc.py
+++ b/server/dive_server/crud_rpc.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 import json
 from typing import Dict, List, Optional, Tuple, TypedDict
+from pathlib import Path
 
 from girder.constants import AccessType
 from girder.exceptions import RestException
@@ -367,6 +368,35 @@ def run_pipeline(
     return job
 
 
+def get_calibration(
+    user: types.GirderUserModel,
+    folder: types.GirderModel,
+) -> dict | None:
+    folder_id_str = str(folder["_id"])
+    dataset_type = fromMeta(folder, "type", required=True)
+
+    if dataset_type != constants.MultiType:
+        raise RestException('Cannot search for calibration file on non stereo/multicam datasets', code=400)
+    
+    print("Dataset Type", dataset_type)
+    calibration_item_id = crud_dataset.find_calibration_item_id(folder_id_str)
+    print("calibration item id", calibration_item_id)
+
+    if calibration_item_id is None:
+        return None
+
+    calibration_item = Item().load(calibration_item_id, level=AccessType.READ, user=user)
+    print("calibration item", calibration_item)
+
+    files = Item().fileList(calibration_item, user, data=True)
+    for file in files:
+        if Path(file[0]).suffix == '.json':
+            data = json.loads(b"".join(list(file[1]())).decode("utf-8"))
+            return data
+
+    raise RestException('Calibration file not supported', code=400)
+
+
 def export_trained_pipeline(
     user: types.GirderUserModel,
     model_folder: types.GirderModel,
diff --git a/server/dive_server/views_rpc.py b/server/dive_server/views_rpc.py
index 911d10419..75210d3cd 100644
--- a/server/dive_server/views_rpc.py
+++ b/server/dive_server/views_rpc.py
@@ -23,6 +23,7 @@ def __init__(self, resourceName):
         self.resourceName = resourceName
 
         self.route("POST", ("pipeline",), self.run_pipeline_task)
+        self.route("GET",  ("calibration",), self.get_dataset_calibration)
         self.route("POST", ("export",), self.export_pipeline_onnx)
         self.route("POST", ("train",), self.run_training)
         self.route("POST", ("postprocess", ":id"), self.postprocess)
@@ -68,6 +69,26 @@ def run_pipeline_task(
         return crud_rpc.run_pipeline(
             self.getCurrentUser(), folder, pipeline, forceTranscoded, pipelineParams
         )
+    
+    @access.user
+    @autoDescribeRoute(
+        Description("Get calibration information of dataset")
+        .modelParam(
+            "folderId",
+            description="Folder id of a video clip",
+            model=Folder,
+            paramType="query",
+            required=True,
+            level=AccessType.READ,
+        )
+    )
+    def get_dataset_calibration(
+        self,
+        folder,
+    ):
+        return crud_rpc.get_calibration(
+            self.getCurrentUser(), folder
+        )
 
     @access.user
     @autoDescribeRoute(

From 8990b8c5f16ca81d45cdb0a6cbed2a4f38e9603a Mon Sep 17 00:00:00 2001
From: Louis Pagnier <louis.pagnier@kitware.com>
Date: Thu, 25 Jun 2026 15:22:18 +0200
Subject: [PATCH 03/25] refac calibration menu + implement delete & download

(cherry picked from commit 72e39e21e7287584fba2989aaaef6b88de0f5bcd)
---
 client/dive-common/apispec.ts                 | 36 ++++++++-
 .../components/CalibrationDialog.vue          | 64 ++++++++++------
 .../components/CalibrationMenu.vue            | 34 +++++++--
 .../web-girder/api/dataset.service.ts         |  7 ++
 .../platform/web-girder/api/girder.service.ts |  5 ++
 client/platform/web-girder/api/rpc.service.ts |  7 --
 server/dive_server/crud_dataset.py            | 76 +++++++++++++++++++
 server/dive_server/crud_rpc.py                | 29 -------
 server/dive_server/views_dataset.py           | 21 +++++
 server/dive_server/views_rpc.py               | 21 -----
 server/dive_utils/types.py                    | 30 ++++++++
 11 files changed, 244 insertions(+), 86 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index 6a14ff3e6..d72a39520 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -200,12 +200,43 @@ interface DatasetMeta extends DatasetMetaMutable {
   calibration?: Readonly<string | null>;
 }
 
+interface CameraCalibration {
+  cx: number
+  cy: number
+  fx: number
+  fy: number
+  k1: number
+  k2: number
+  k3: number
+  p1: number
+  p2: number
+  rmsError: number
+}
+
+interface DatasetStereoCalibration {
+  R: number[]
+  T: number[]
+  gridHeight: number
+  gridWidth: number
+  imageHeight: number
+  imageWidth: number
+  squareSize: number
+  rmsError: number
+  calibrations: Record<string, CameraCalibration>
+}
+
+interface DatasetCalibrationResult {
+  calibration: DatasetStereoCalibration
+  itemId?: string;
+  path?: string;
+}
+
 interface Api {
   getPipelineList(): Promise<Pipelines>;
   runPipeline(itemId: string, pipeline: Pipe, pipelineParams?: PipelineParams): Promise<unknown>;
   deleteTrainedPipeline(pipeline: Pipe): Promise<void>;
   exportTrainedPipeline(path: string, pipeline: Pipe): Promise<unknown>;
-  getDatasetCalibration(datasetId: string): Promise<unknown>;
+  getDatasetCalibration(datasetId: string): Promise<DatasetCalibrationResult>;
 
   getTrainingConfigurations(): Promise<TrainingConfigs>;
   runTraining(
@@ -293,6 +324,9 @@ export {
   DatasetMetaMutableKeys,
   DatasetType,
   DiveParam,
+  CameraCalibration,
+  DatasetStereoCalibration,
+  DatasetCalibrationResult,
   SubType,
   PipelineParamType,
   FrameImage,
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index 5e4ccfb7f..ed815f340 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -1,22 +1,38 @@
 <script lang="ts">
+import { DatasetStereoCalibration } from 'dive-common/apispec';
 import {
   defineComponent,
   PropType,
   ref,
-  watch,
 } from 'vue';
 
 export default defineComponent({
   name: 'CalibrationDialog',
   props: {
     value: { type: Boolean, required: true },
-    calibration: { type: Object, default: null },
+    calibration: { type: Object as PropType<DatasetStereoCalibration | undefined>, default: undefined },
   },
   setup(props, { emit }) {
     const close = () => emit('input', false);
 
+    const downloadCalibration = () => {
+      emit('download');
+      close();
+    };
+
+    const deleteCalibration = () => {
+      emit('delete');
+    };
+
+    const importCalibration = () => {
+
+    };
+
     return {
       close,
+      downloadCalibration,
+      deleteCalibration,
+      importCalibration,
     };
   },
 });
@@ -29,7 +45,7 @@ export default defineComponent({
     scrollable
     @input="$emit('input', $event)"
   >
-    <v-card v-if="calibration" class="rounded-lg">
+    <v-card class="rounded-lg">
       <v-toolbar flat color="primary" dark dense>
         <v-icon left>
           mdi-checkerboard
@@ -44,7 +60,7 @@ export default defineComponent({
       </v-toolbar>
 
       <v-card-text class="pa-4">
-        <div class="mb-6">
+        <div v-if="calibration" class="mb-6">
           <div class="text-subtitle-1 font-weight-bold mb-2">General</div>
           <v-simple-table dense class="mb-4 elevation-1">
             <template v-slot:default>
@@ -55,10 +71,10 @@ export default defineComponent({
                 </tr>
               </thead>
               <tbody>
-                <tr><td>Image resolution</td><td>{{ calibration.image_width }} x {{ calibration.image_height }} px</td></tr>
-                <tr><td>Calibration grid</td><td>{{ calibration.grid_width }} x {{ calibration.grid_height }}</td></tr>
-                <tr><td>Square size</td><td>{{ calibration.square_size_mm }} mm</td></tr>
-                <tr><td>Stereo RMS Error</td><td>{{ calibration.rms_error_stereo }}</td></tr>
+                <tr><td>Image resolution</td><td>{{ calibration.imageWidth }} x {{ calibration.imageHeight }} px</td></tr>
+                <tr><td>Calibration grid</td><td>{{ calibration.gridWidth }} x {{ calibration.gridHeight }}</td></tr>
+                <tr><td>Square size</td><td>{{ calibration.squareSize }} mm</td></tr>
+                <tr><td>Stereo RMS Error</td><td>{{ calibration.rmsError }}</td></tr>
               </tbody>
             </template>
           </v-simple-table>
@@ -69,35 +85,29 @@ export default defineComponent({
               <thead>
                 <tr>
                   <th class="text-left">Property</th>
-                  <th class="text-left">Left Camera</th>
-                  <th class="text-left">Right Camera</th>
+                  <th v-for="(_, cameraName, __) in calibration.calibrations" class="text-left">{{ cameraName }} camera</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
                   <td><strong>Focal (fx, fy)</strong></td>
-                  <td>{{ calibration.fx_left }} , {{ calibration.fy_left }}</td>
-                  <td>{{ calibration.fx_right }} , {{ calibration.fy_right }}</td>
+                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.fx }} , {{ calib.fy }}</td>
                 </tr>
                 <tr>
                   <td><strong>Optical center (cx, cy)</strong></td>
-                  <td>{{ calibration.cx_left }} , {{ calibration.cy_left }}</td>
-                  <td>{{ calibration.cx_right }} , {{ calibration.cy_right }}</td>
+                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.cx }} , {{ calib.cy }}</td>
                 </tr>
                 <tr>
                   <td><strong>Radial Distortion (k1, k2, k3)</strong></td>
-                  <td>{{ calibration.k1_left }} , {{ calibration.k2_left }} , {{ calibration.k3_left }}</td>
-                  <td>{{ calibration.k1_right }} , {{ calibration.k2_right }} , {{ calibration.k3_right }}</td>
+                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.k1 }} , {{ calib.k2 }} , {{ calib.k3 }}</td>
                 </tr>
                 <tr>
                   <td><strong>Tangential Distortion (p1, p2)</strong></td>
-                  <td>{{ calibration.p1_left }} , {{ calibration.p2_left }}</td>
-                  <td>{{ calibration.p1_right }} , {{ calibration.p2_right }}</td>
+                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.p1 }} , {{ calib.p2 }}</td>
                 </tr>
                 <tr>
                   <td><strong>RMS Error</strong></td>
-                  <td>{{ calibration.rms_error_left }}</td>
-                  <td>{{ calibration.rms_error_right }}</td>
+                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.rmsError }}</td>
                 </tr>
               </tbody>
             </template>
@@ -123,6 +133,14 @@ export default defineComponent({
             </v-col>
           </v-row>
         </div>
+        <div v-else>
+          <div class="text-subtitle-1 font-weight-bold mb-2">No calibration loaded</div>
+          <div>
+            Calibration is needed to run stereoscopic pipelines.
+            <br>
+            You can import a calibration manually, or run a calibration pipeline on a checkerboard image sequence or video.
+          </div>
+        </div>
       </v-card-text>
 
       <v-divider />
@@ -132,19 +150,19 @@ export default defineComponent({
           Cancel
         </v-btn>
         <v-spacer />
-        <v-btn color="red" outlined @click="close">
+        <v-btn v-if="calibration" color="red" outlined @click="deleteCalibration">
           <v-icon left>
             mdi-delete-outline
           </v-icon>
           Delete
         </v-btn>
-        <v-btn color="primary" outlined @click="close">
+        <v-btn color="primary" :outlined="calibration" @click="importCalibration">
           <v-icon left>
             mdi-upload
           </v-icon>
           Import
         </v-btn>
-        <v-btn color="primary" @click="close">
+        <v-btn v-if="calibration" color="primary" @click="downloadCalibration">
           <v-icon left>
             mdi-download
           </v-icon>
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index d4ff6161d..f027f40f4 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -5,9 +5,12 @@ import {
 } from 'vue';
 
 import {
+  DatasetCalibrationResult,
   useApi,
 } from 'dive-common/apispec';
 
+import { deleteItem, deleteResources, getUri } from 'platform/web-girder/api';
+
 import CalibrationDialog from './CalibrationDialog.vue';
 
 export default defineComponent({
@@ -20,17 +23,36 @@ export default defineComponent({
   },
   setup(props) {
     const showCalibrationDialog = ref(false);
-    const calibration = ref({});
+    const calibrationResult = ref<DatasetCalibrationResult>();
 
     const { getDatasetCalibration } = useApi();
 
     getDatasetCalibration(props.datasetId).then((res) => {
-      calibration.value = res;
+      console.log("then", res)
+      calibrationResult.value = res;
     })
 
+    const downloadCalibration = () => {
+      const url = getUri({ url: `file/${calibrationResult.value?.itemId}/download` });
+      window.location.assign(url);
+    };
+
+    const deleteCalibration = () => {
+      console.log("delete");
+      console.log(calibrationResult.value);
+      if (calibrationResult.value?.itemId) {
+        deleteItem(calibrationResult.value.itemId).then(() => {
+          console.log("deleted")
+          calibrationResult.value = undefined;
+        });
+      }
+    };
+
     return {
       showCalibrationDialog,
-      calibration
+      calibrationResult,
+      downloadCalibration,
+      deleteCalibration,
     };
   },
 });
@@ -45,7 +67,7 @@ export default defineComponent({
       <v-btn
         color=""
         class="calibration-icon mx-1 mode-button"
-        :class="{ 'not-calibrated': !calibration }"
+        :class="{ 'not-calibrated': !calibrationResult }"
         small
         v-on="on"
         @click="showCalibrationDialog = true"
@@ -58,7 +80,9 @@ export default defineComponent({
 
     <CalibrationDialog
       v-model="showCalibrationDialog"
-      :calibration="calibration"
+      :calibration="calibrationResult?.calibration"
+      @download="downloadCalibration"
+      @delete="deleteCalibration"
     />
   </div>
 </template>
diff --git a/client/platform/web-girder/api/dataset.service.ts b/client/platform/web-girder/api/dataset.service.ts
index 2efe7d809..399b5ee5c 100644
--- a/client/platform/web-girder/api/dataset.service.ts
+++ b/client/platform/web-girder/api/dataset.service.ts
@@ -79,6 +79,12 @@ function clone({
   });
 }
 
+function getDatasetCalibration(datasetId: string) {
+  return girderRest.get('dive_dataset/calibration', {
+    params: {folderId: datasetId}
+  });
+}
+
 function createGirderFolder({
   folderId, name, description,
 }: {
@@ -274,6 +280,7 @@ export {
   getDatasetList,
   getDatasetMedia,
   hasCalibrationFile,
+  getDatasetCalibration,
   importAnnotationFile,
   makeViameFolder,
   saveAttributes,
diff --git a/client/platform/web-girder/api/girder.service.ts b/client/platform/web-girder/api/girder.service.ts
index fa7c9628b..566e5bcd9 100644
--- a/client/platform/web-girder/api/girder.service.ts
+++ b/client/platform/web-girder/api/girder.service.ts
@@ -17,6 +17,10 @@ function deleteResources(resources: Array<GirderModel>) {
   return girderRest.delete('resource', { data: formData });
 }
 
+function deleteItem(itemId: string) {
+  return girderRest.delete(`item/${itemId}`);
+}
+
 function getItemsInFolder(folderId: string, limit: number) {
   return girderRest.get<GirderModel[]>('item', {
     params: { folderId, limit },
@@ -62,6 +66,7 @@ async function getSharedWithMeFolders(
 
 export {
   deleteResources,
+  deleteItem,
   getItemsInFolder,
   getFolder,
   setUsePrivateQueue,
diff --git a/client/platform/web-girder/api/rpc.service.ts b/client/platform/web-girder/api/rpc.service.ts
index 7dec3d8c8..7bc6ac109 100644
--- a/client/platform/web-girder/api/rpc.service.ts
+++ b/client/platform/web-girder/api/rpc.service.ts
@@ -54,12 +54,6 @@ function exportTrainedPipeline(path: string, pipeline: Pipe) {
   });
 }
 
-function getDatasetCalibration(datasetId: string) {
-  return girderRest.get('dive_rpc/calibration', {
-    params: {folderId: datasetId}
-  });
-}
-
 function convertLargeImage(folderId: string) {
   return girderRest.post(`dive_rpc/convert_large_image/${folderId}`, null, {});
 }
@@ -71,5 +65,4 @@ export {
   runTraining,
   deleteTrainedPipeline,
   exportTrainedPipeline,
-  getDatasetCalibration,
 };
diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index cf7bd20bd..3bde3ee6c 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -9,6 +9,7 @@
 from girder.exceptions import RestException
 from girder.models.folder import Folder
 from girder.models.item import Item
+from girder.models.file import File
 from girder.utility import ziputil
 from pydantic.main import BaseModel
 
@@ -1138,3 +1139,78 @@ def validate_files(files: List[str]):
         "media": images + videos + large_images,
         "annotations": csvs + ymls + jsons,
     }
+
+
+def get_calibration(
+    user: types.GirderUserModel,
+    folder: types.GirderModel,
+) -> types.DatasetCalibrationResult | None:
+    folder_id_str = str(folder["_id"])
+    dataset_type = fromMeta(folder, "type", required=True)
+
+    if dataset_type != constants.MultiType:
+        raise RestException('Cannot search for calibration file on non stereo/multicam datasets', code=400)
+    
+    calibration_item_id = find_calibration_item_id(folder_id_str)
+    if calibration_item_id is None:
+        return None
+
+    calibration_item = Item().load(calibration_item_id, level=AccessType.READ, user=user)
+
+    files = Item().childFiles(calibration_item)
+    for file in files:
+        file_name = file['name']
+        file_name.endswith('.json')
+
+        if file_name.endswith('.json'):
+            with File().open(file) as fh:
+                chunks = []
+                while True:
+                    chunk = fh.read(4096)
+                    if not chunk:
+                        break
+                    chunks.append(chunk)
+
+            data = json.loads(b"".join(chunks).decode("utf-8"))
+
+            calib_left = types.CameraCalibration(
+                cx=data['cx_left'],
+                cy=data['cy_left'],
+                fx=data['fx_left'],
+                fy=data['fy_left'],
+                k1=data['k1_left'],
+                k2=data['k2_left'],
+                k3=data['k3_left'],
+                p1=data['p1_left'],
+                p2=data['p2_left'],
+                rmsError=data['rms_error_left'],
+            )
+
+            calib_right = types.CameraCalibration(
+                cx=data['cx_right'],
+                cy=data['cy_right'],
+                fx=data['fx_right'],
+                fy=data['fy_right'],
+                k1=data['k1_right'],
+                k2=data['k2_right'],
+                k3=data['k3_right'],
+                p1=data['p1_right'],
+                p2=data['p2_right'],
+                rmsError=data['rms_error_right'],
+            )
+
+            dataset_calibration = types.DatasetStereoCalibration(
+                R=data['R'],
+                T=data['T'],
+                gridHeight=data['grid_height'],
+                gridWidth=data['grid_width'],
+                imageHeight=data['image_height'],
+                imageWidth=data['image_width'],
+                squareSize=data['square_size_mm'],
+                rmsError=data['rms_error_stereo'],
+                calibrations={'left': calib_left, 'right': calib_right},
+            )
+
+            return types.DatasetCalibrationResult(calibration=dataset_calibration, itemId=calibration_item['_id'])
+
+    raise RestException('Calibration file not supported', code=400)
diff --git a/server/dive_server/crud_rpc.py b/server/dive_server/crud_rpc.py
index 1a0e7f426..a5a416c97 100644
--- a/server/dive_server/crud_rpc.py
+++ b/server/dive_server/crud_rpc.py
@@ -368,35 +368,6 @@ def run_pipeline(
     return job
 
 
-def get_calibration(
-    user: types.GirderUserModel,
-    folder: types.GirderModel,
-) -> dict | None:
-    folder_id_str = str(folder["_id"])
-    dataset_type = fromMeta(folder, "type", required=True)
-
-    if dataset_type != constants.MultiType:
-        raise RestException('Cannot search for calibration file on non stereo/multicam datasets', code=400)
-    
-    print("Dataset Type", dataset_type)
-    calibration_item_id = crud_dataset.find_calibration_item_id(folder_id_str)
-    print("calibration item id", calibration_item_id)
-
-    if calibration_item_id is None:
-        return None
-
-    calibration_item = Item().load(calibration_item_id, level=AccessType.READ, user=user)
-    print("calibration item", calibration_item)
-
-    files = Item().fileList(calibration_item, user, data=True)
-    for file in files:
-        if Path(file[0]).suffix == '.json':
-            data = json.loads(b"".join(list(file[1]())).decode("utf-8"))
-            return data
-
-    raise RestException('Calibration file not supported', code=400)
-
-
 def export_trained_pipeline(
     user: types.GirderUserModel,
     model_folder: types.GirderModel,
diff --git a/server/dive_server/views_dataset.py b/server/dive_server/views_dataset.py
index 8bdf9b1c8..8e7dce9f1 100644
--- a/server/dive_server/views_dataset.py
+++ b/server/dive_server/views_dataset.py
@@ -37,6 +37,7 @@ def __init__(self, resourceName):
         self.route("POST", ("multicam",), self.create_multicam)
         self.route("GET", (), self.list_datasets)
         self.route("GET", (":id",), self.get_meta)
+        self.route("GET", ("calibration",), self.get_dataset_calibration)
         self.route("GET", (":id", "media"), self.get_media)
         self.route("GET", ("export",), self.export)
         self.route("GET", (":id", "configuration"), self.get_configuration)
@@ -200,6 +201,26 @@ def list_datasets(
     )
     def get_meta(self, folder):
         return crud_dataset.get_dataset(folder, self.getCurrentUser()).dict(exclude_none=True)
+    
+    @access.user
+    @autoDescribeRoute(
+        Description("Get calibration information of dataset")
+        .modelParam(
+            "folderId",
+            description="Folder id of a video clip",
+            model=Folder,
+            paramType="query",
+            required=True,
+            level=AccessType.READ,
+        )
+    )
+    def get_dataset_calibration(
+        self,
+        folder,
+    ):
+        return crud_dataset.get_calibration(
+            self.getCurrentUser(), folder
+        )
 
     @access.public(scope=TokenScope.DATA_READ, cookie=True)
     @rawResponse
diff --git a/server/dive_server/views_rpc.py b/server/dive_server/views_rpc.py
index 75210d3cd..911d10419 100644
--- a/server/dive_server/views_rpc.py
+++ b/server/dive_server/views_rpc.py
@@ -23,7 +23,6 @@ def __init__(self, resourceName):
         self.resourceName = resourceName
 
         self.route("POST", ("pipeline",), self.run_pipeline_task)
-        self.route("GET",  ("calibration",), self.get_dataset_calibration)
         self.route("POST", ("export",), self.export_pipeline_onnx)
         self.route("POST", ("train",), self.run_training)
         self.route("POST", ("postprocess", ":id"), self.postprocess)
@@ -69,26 +68,6 @@ def run_pipeline_task(
         return crud_rpc.run_pipeline(
             self.getCurrentUser(), folder, pipeline, forceTranscoded, pipelineParams
         )
-    
-    @access.user
-    @autoDescribeRoute(
-        Description("Get calibration information of dataset")
-        .modelParam(
-            "folderId",
-            description="Folder id of a video clip",
-            model=Folder,
-            paramType="query",
-            required=True,
-            level=AccessType.READ,
-        )
-    )
-    def get_dataset_calibration(
-        self,
-        folder,
-    ):
-        return crud_rpc.get_calibration(
-            self.getCurrentUser(), folder
-        )
 
     @access.user
     @autoDescribeRoute(
diff --git a/server/dive_utils/types.py b/server/dive_utils/types.py
index 274a42190..ae531d0e0 100644
--- a/server/dive_utils/types.py
+++ b/server/dive_utils/types.py
@@ -182,6 +182,36 @@ class DIVEAnnotationSchema(TypedDict):
     version: int
 
 
+class CameraCalibration(TypedDict):
+    cx: float
+    cy: float
+    fx: float
+    fy: float
+    k1: float
+    k2: float
+    k3: float
+    p1: float
+    p2: float
+    rmsError: float
+
+
+class DatasetStereoCalibration(TypedDict):
+    R: List[float]
+    T: List[float]
+    gridHeight: int
+    gridWidth: int
+    imageHeight: int
+    imageWidth: int
+    squareSize: float
+    rmsError: float
+    calibrations: Dict[str, CameraCalibration]
+
+
+class DatasetCalibrationResult(TypedDict):
+    calibration: DatasetStereoCalibration
+    itemId: str
+
+
 # Attribute metadata discovered while deserializing annotations, keyed by attribute name.
 Attributes = Dict[str, Dict[str, Any]]
 

From 7fa75e72fffc51e3150149d21d40a271425b5103 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 01:40:34 -0400
Subject: [PATCH 04/25] Show calibration filename and make calibration dialog
 work on desktop

Implement a desktop getDatasetCalibration that parses the stored camera-rig JSON, plus cross-platform download/delete, so the checkerboard calibration menu and dialog now function in Electron instead of being web-only. Display the loaded calibration file name in the dialog and tooltip on both desktop and web, and return the file name from the server calibration endpoint.

(cherry picked from commit ffaf0121a61d75f6c9bdd7d282ecd10c5dc923ac)
---
 client/dive-common/apispec.ts                 | 11 ++-
 .../components/CalibrationDialog.vue          | 13 ++-
 .../components/CalibrationMenu.vue            | 88 +++++++++++--------
 client/platform/desktop/backend/ipcService.ts |  6 ++
 .../platform/desktop/backend/native/common.ts | 77 ++++++++++++++++
 client/platform/desktop/frontend/api.ts       | 24 +++++
 client/platform/web-girder/App.vue            |  4 +
 client/platform/web-girder/api/index.ts       | 19 ++++
 server/dive_server/crud_dataset.py            |  6 +-
 server/dive_utils/types.py                    |  1 +
 10 files changed, 204 insertions(+), 45 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index d72a39520..c23491764 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -226,8 +226,11 @@ interface DatasetStereoCalibration {
 }
 
 interface DatasetCalibrationResult {
-  calibration: DatasetStereoCalibration
+  /** Parsed calibration parameters. May be absent when a calibration file is
+   * present but could not be parsed (e.g. an unconverted non-JSON format). */
+  calibration?: DatasetStereoCalibration
   itemId?: string;
+  /** Name of the calibration file currently associated with the dataset. */
   path?: string;
 }
 
@@ -236,7 +239,7 @@ interface Api {
   runPipeline(itemId: string, pipeline: Pipe, pipelineParams?: PipelineParams): Promise<unknown>;
   deleteTrainedPipeline(pipeline: Pipe): Promise<void>;
   exportTrainedPipeline(path: string, pipeline: Pipe): Promise<unknown>;
-  getDatasetCalibration(datasetId: string): Promise<DatasetCalibrationResult>;
+  getDatasetCalibration(datasetId: string): Promise<DatasetCalibrationResult | null>;
 
   getTrainingConfigurations(): Promise<TrainingConfigs>;
   runTraining(
@@ -295,6 +298,10 @@ interface Api {
   importCalibrationFile?(datasetId: string, path: string): Promise<{ calibration: string }>;
   /** Desktop: copy the dataset's current camera/calibration file out to destPath. */
   exportCalibrationFile?(datasetId: string, destPath: string): Promise<{ exportedPath: string }>;
+  /** Download/export the dataset's current calibration file (platform-specific). */
+  downloadCalibration?(datasetId: string): Promise<void>;
+  /** Remove the calibration file currently associated with the dataset. */
+  deleteCalibration?(datasetId: string): Promise<void>;
 }
 const ApiSymbol = Symbol('api');
 
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index ed815f340..c160f5265 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -11,6 +11,9 @@ export default defineComponent({
   props: {
     value: { type: Boolean, required: true },
     calibration: { type: Object as PropType<DatasetStereoCalibration | undefined>, default: undefined },
+    fileName: { type: String as PropType<string | undefined>, default: undefined },
+    showDownload: { type: Boolean, default: true },
+    showDelete: { type: Boolean, default: true },
   },
   setup(props, { emit }) {
     const close = () => emit('input', false);
@@ -60,6 +63,10 @@ export default defineComponent({
       </v-toolbar>
 
       <v-card-text class="pa-4">
+        <div v-if="fileName" class="mb-4">
+          <span class="text-subtitle-1 font-weight-bold mr-2">File:</span>
+          <span>{{ fileName }}</span>
+        </div>
         <div v-if="calibration" class="mb-6">
           <div class="text-subtitle-1 font-weight-bold mb-2">General</div>
           <v-simple-table dense class="mb-4 elevation-1">
@@ -150,19 +157,19 @@ export default defineComponent({
           Cancel
         </v-btn>
         <v-spacer />
-        <v-btn v-if="calibration" color="red" outlined @click="deleteCalibration">
+        <v-btn v-if="fileName && showDelete" color="red" outlined @click="deleteCalibration">
           <v-icon left>
             mdi-delete-outline
           </v-icon>
           Delete
         </v-btn>
-        <v-btn color="primary" :outlined="calibration" @click="importCalibration">
+        <v-btn color="primary" :outlined="!!calibration" @click="importCalibration">
           <v-icon left>
             mdi-upload
           </v-icon>
           Import
         </v-btn>
-        <v-btn v-if="calibration" color="primary" @click="downloadCalibration">
+        <v-btn v-if="fileName && showDownload" color="primary" @click="downloadCalibration">
           <v-icon left>
             mdi-download
           </v-icon>
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index f027f40f4..0b7e3e682 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -1,5 +1,6 @@
 <script lang="ts">
 import {
+  computed,
   defineComponent,
   ref,
 } from 'vue';
@@ -9,50 +10,49 @@ import {
   useApi,
 } from 'dive-common/apispec';
 
-import { deleteItem, deleteResources, getUri } from 'platform/web-girder/api';
-
 import CalibrationDialog from './CalibrationDialog.vue';
 
 export default defineComponent({
   name: 'CalibrationMenu',
-  props: {
-    datasetId: { type: String, required: true },
-  },
   components: {
     CalibrationDialog,
   },
+  props: {
+    datasetId: { type: String, required: true },
+  },
   setup(props) {
     const showCalibrationDialog = ref(false);
     const calibrationResult = ref<DatasetCalibrationResult>();
 
-    const { getDatasetCalibration } = useApi();
+    const {
+      getDatasetCalibration, downloadCalibration, deleteCalibration,
+    } = useApi();
+
+    const refresh = () => getDatasetCalibration(props.datasetId).then((res) => {
+      calibrationResult.value = res ?? undefined;
+    });
+    refresh();
 
-    getDatasetCalibration(props.datasetId).then((res) => {
-      console.log("then", res)
-      calibrationResult.value = res;
-    })
+    const calibrationFileName = computed(() => calibrationResult.value?.path);
 
-    const downloadCalibration = () => {
-      const url = getUri({ url: `file/${calibrationResult.value?.itemId}/download` });
-      window.location.assign(url);
+    const onDownload = () => {
+      downloadCalibration?.(props.datasetId);
     };
 
-    const deleteCalibration = () => {
-      console.log("delete");
-      console.log(calibrationResult.value);
-      if (calibrationResult.value?.itemId) {
-        deleteItem(calibrationResult.value.itemId).then(() => {
-          console.log("deleted")
-          calibrationResult.value = undefined;
-        });
-      }
+    const onDelete = () => {
+      deleteCalibration?.(props.datasetId).then(() => {
+        calibrationResult.value = undefined;
+      });
     };
 
     return {
       showCalibrationDialog,
       calibrationResult,
-      downloadCalibration,
-      deleteCalibration,
+      calibrationFileName,
+      canDownload: !!downloadCalibration,
+      canDelete: !!deleteCalibration,
+      onDownload,
+      onDelete,
     };
   },
 });
@@ -62,27 +62,37 @@ export default defineComponent({
   <div>
     <v-tooltip
       bottom
-      :z-index="20">
+      :z-index="20"
+    >
       <template #activator="{ on }">
-      <v-btn
-        color=""
-        class="calibration-icon mx-1 mode-button"
-        :class="{ 'not-calibrated': !calibrationResult }"
-        small
-        v-on="on"
-        @click="showCalibrationDialog = true"
-      >
-        <v-icon>mdi-checkerboard</v-icon>
-      </v-btn>
+        <v-btn
+          color=""
+          class="calibration-icon mx-1 mode-button"
+          :class="{ 'not-calibrated': !calibrationResult }"
+          small
+          v-on="on"
+          @click="showCalibrationDialog = true"
+        >
+          <v-icon>mdi-checkerboard</v-icon>
+        </v-btn>
       </template>
-      <span>Cameras calibration</span>
+      <span>
+        Cameras calibration
+        <template v-if="calibrationFileName">
+          <br>
+          {{ calibrationFileName }}
+        </template>
+      </span>
     </v-tooltip>
 
     <CalibrationDialog
       v-model="showCalibrationDialog"
       :calibration="calibrationResult?.calibration"
-      @download="downloadCalibration"
-      @delete="deleteCalibration"
+      :file-name="calibrationFileName"
+      :show-download="canDownload"
+      :show-delete="canDelete"
+      @download="onDownload"
+      @delete="onDelete"
     />
   </div>
 </template>
@@ -104,4 +114,4 @@ export default defineComponent({
   border: 1px solid grey;
   min-width: 36px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/client/platform/desktop/backend/ipcService.ts b/client/platform/desktop/backend/ipcService.ts
index beba25675..ee917afa2 100644
--- a/client/platform/desktop/backend/ipcService.ts
+++ b/client/platform/desktop/backend/ipcService.ts
@@ -221,6 +221,12 @@ export default function register() {
     return { exportedPath };
   });
 
+  ipcMain.handle('get-dataset-calibration', async (_, { datasetId }: { datasetId: string }) => common.getDatasetCalibration(settings.get(), datasetId));
+
+  ipcMain.handle('delete-calibration', async (_, { datasetId }: { datasetId: string }) => {
+    await common.deleteDatasetCalibration(settings.get(), datasetId);
+  });
+
   ipcMain.handle('finalize-import', async (event, args: DesktopMediaImportResponse) => common.finalizeMediaImport(settings.get(), args));
 
   ipcMain.handle('convert', async (event, args: ConversionArgs) => {
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 48ba46a89..1a36b19a3 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -25,6 +25,8 @@ import {
   Pipe,
   PipeMetadata,
   PipelineParamType,
+  DatasetCalibrationResult,
+  DatasetStereoCalibration,
 } from 'dive-common/apispec';
 import * as viameSerializers from 'platform/desktop/backend/serializers/viame';
 import * as nistSerializers from 'platform/desktop/backend/serializers/nist';
@@ -1710,6 +1712,79 @@ async function exportDatasetCalibration(
   return destPath;
 }
 
+/**
+ * Parse a KWIVER/VIAME JSON camera-rig file into the shared
+ * DatasetStereoCalibration shape. Mirrors the web server parser
+ * (server/dive_server/crud_dataset.py:get_calibration).
+ */
+function parseStereoCalibrationJson(data: Record<string, number | number[]>): DatasetStereoCalibration {
+  const cameraFor = (side: 'left' | 'right') => ({
+    cx: data[`cx_${side}`] as number,
+    cy: data[`cy_${side}`] as number,
+    fx: data[`fx_${side}`] as number,
+    fy: data[`fy_${side}`] as number,
+    k1: data[`k1_${side}`] as number,
+    k2: data[`k2_${side}`] as number,
+    k3: data[`k3_${side}`] as number,
+    p1: data[`p1_${side}`] as number,
+    p2: data[`p2_${side}`] as number,
+    rmsError: data[`rms_error_${side}`] as number,
+  });
+  return {
+    R: data.R as number[],
+    T: data.T as number[],
+    gridHeight: data.grid_height as number,
+    gridWidth: data.grid_width as number,
+    imageHeight: data.image_height as number,
+    imageWidth: data.image_width as number,
+    squareSize: data.square_size_mm as number,
+    rmsError: data.rms_error_stereo as number,
+    calibrations: { left: cameraFor('left'), right: cameraFor('right') },
+  };
+}
+
+/**
+ * Read the calibration file currently associated with a dataset and return its
+ * parsed parameters (when JSON) plus the file name, for display in the viewer.
+ */
+async function getDatasetCalibration(
+  settings: Settings,
+  datasetId: string,
+): Promise<DatasetCalibrationResult | null> {
+  const calibrationPath = await getDatasetCalibrationPath(settings, datasetId.split('/')[0]);
+  if (!calibrationPath || !(await fs.pathExists(calibrationPath))) {
+    return null;
+  }
+  const result: DatasetCalibrationResult = { path: npath.basename(calibrationPath) };
+  if (npath.extname(calibrationPath).toLowerCase() === '.json') {
+    try {
+      const data = await fs.readJSON(calibrationPath);
+      result.calibration = parseStereoCalibrationJson(data);
+    } catch (err) {
+      console.error(`Failed to parse calibration JSON for dataset ${datasetId}:`, err);
+    }
+  }
+  return result;
+}
+
+/**
+ * Remove the calibration file associated with a dataset and clear the reference
+ * in its metadata. The original (pre-conversion) file, if any, is left in place.
+ */
+async function deleteDatasetCalibration(settings: Settings, datasetId: string): Promise<void> {
+  const parentId = datasetId.split('/')[0];
+  const projectDirInfo = await getValidatedProjectDir(settings, parentId);
+  const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
+  const calibrationPath = fullMeta.multiCam?.calibration;
+  if (calibrationPath && await fs.pathExists(calibrationPath)) {
+    await fs.remove(calibrationPath);
+  }
+  if (fullMeta.multiCam) {
+    fullMeta.multiCam.calibration = undefined;
+    await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
+  }
+}
+
 export {
   ProjectsFolderName,
   JobsFolderName,
@@ -1752,4 +1827,6 @@ export {
   getDatasetCalibrationPath,
   setDatasetCalibration,
   exportDatasetCalibration,
+  getDatasetCalibration,
+  deleteDatasetCalibration,
 };
diff --git a/client/platform/desktop/frontend/api.ts b/client/platform/desktop/frontend/api.ts
index 9aa40d936..926688521 100644
--- a/client/platform/desktop/frontend/api.ts
+++ b/client/platform/desktop/frontend/api.ts
@@ -4,6 +4,7 @@ import type {
   DatasetMetaMutable, DatasetType, MultiCamImportArgs,
   Pipe, Pipelines, PipelineParams, SaveAttributeArgs,
   SaveAttributeTrackFilterArgs, SaveDetectionsArgs, TrainingConfigs,
+  DatasetCalibrationResult,
 } from 'dive-common/apispec';
 
 import {
@@ -366,6 +367,26 @@ function exportCalibrationFile(datasetId: string, destPath: string): Promise<{ e
   return window.diveDesktop.invoke('export-calibration', { id: datasetId, destPath });
 }
 
+function getDatasetCalibration(datasetId: string): Promise<DatasetCalibrationResult | null> {
+  return window.diveDesktop.invoke('get-dataset-calibration', { datasetId });
+}
+
+async function downloadCalibration(datasetId: string): Promise<void> {
+  const calibration = await getDatasetCalibration(datasetId);
+  const defaultName = calibration?.path ?? `calibration_${datasetId}.json`;
+  const location = await window.diveDesktop.showSaveDialog({
+    title: 'Export Camera File',
+    defaultPath: joinPath(await window.diveDesktop.getAppPath('home'), defaultName),
+  });
+  if (!location.canceled && location.filePath) {
+    await exportCalibrationFile(datasetId, location.filePath);
+  }
+}
+
+function deleteCalibration(datasetId: string): Promise<void> {
+  return window.diveDesktop.invoke('delete-calibration', { datasetId });
+}
+
 export {
   /* Standard Specification APIs */
   loadMetadata,
@@ -406,4 +427,7 @@ export {
   saveCalibration,
   importCalibrationFile,
   exportCalibrationFile,
+  getDatasetCalibration,
+  downloadCalibration,
+  deleteCalibration,
 };
diff --git a/client/platform/web-girder/App.vue b/client/platform/web-girder/App.vue
index 7245b42b9..a7be4d998 100644
--- a/client/platform/web-girder/App.vue
+++ b/client/platform/web-girder/App.vue
@@ -29,6 +29,8 @@ import {
   getTiles,
   getTileURL,
   hasCalibrationFile,
+  downloadCalibration,
+  deleteCalibration,
 } from './api';
 import {
   getLastCalibration,
@@ -59,6 +61,8 @@ export default defineComponent({
       runPipeline: unwrap(runPipeline),
       exportTrainedPipeline: unwrap(exportTrainedPipeline),
       getDatasetCalibration: unwrap(getDatasetCalibration),
+      downloadCalibration,
+      deleteCalibration,
       getTrainingConfigurations: unwrap(getTrainingConfigurations),
       runTraining: unwrap(runTraining),
       loadDetections,
diff --git a/client/platform/web-girder/api/index.ts b/client/platform/web-girder/api/index.ts
index bf459802a..ce13b3f91 100644
--- a/client/platform/web-girder/api/index.ts
+++ b/client/platform/web-girder/api/index.ts
@@ -2,6 +2,9 @@
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import girderRest from 'platform/web-girder/plugins/girder';
 
+import { getDatasetCalibration } from './dataset.service';
+import { deleteItem } from './girder.service';
+
 export * from './annotation.service';
 export * from './configuration.service';
 export * from './dataset.service';
@@ -32,3 +35,19 @@ export function unwrap<T extends(...args: any) => Promise<AxiosResponse<any>>>(f
 export function getUri(config: AxiosRequestConfig) {
   return girderRest.apiRoot.replace(/\/*$/i, '/') + girderRest.getUri(config).replace(/^\/*/, '');
 }
+
+/** Trigger a browser download of the dataset's current calibration file. */
+export async function downloadCalibration(datasetId: string): Promise<void> {
+  const { data } = await getDatasetCalibration(datasetId);
+  if (data?.itemId) {
+    window.location.assign(getUri({ url: `file/${data.itemId}/download` }));
+  }
+}
+
+/** Delete the Girder item holding the dataset's calibration file. */
+export async function deleteCalibration(datasetId: string): Promise<void> {
+  const { data } = await getDatasetCalibration(datasetId);
+  if (data?.itemId) {
+    await deleteItem(data.itemId);
+  }
+}
diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index 3bde3ee6c..7475a48bb 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -1211,6 +1211,10 @@ def get_calibration(
                 calibrations={'left': calib_left, 'right': calib_right},
             )
 
-            return types.DatasetCalibrationResult(calibration=dataset_calibration, itemId=calibration_item['_id'])
+            return types.DatasetCalibrationResult(
+                calibration=dataset_calibration,
+                itemId=calibration_item['_id'],
+                path=file_name,
+            )
 
     raise RestException('Calibration file not supported', code=400)
diff --git a/server/dive_utils/types.py b/server/dive_utils/types.py
index ae531d0e0..4b779597d 100644
--- a/server/dive_utils/types.py
+++ b/server/dive_utils/types.py
@@ -210,6 +210,7 @@ class DatasetStereoCalibration(TypedDict):
 class DatasetCalibrationResult(TypedDict):
     calibration: DatasetStereoCalibration
     itemId: str
+    path: str
 
 
 # Attribute metadata discovered while deserializing annotations, keyed by attribute name.

From 16b5cbbf3f50499cb9854cd052d9d8b9b529dffb Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 09:17:43 -0400
Subject: [PATCH 05/25] Fix calibration import for multicam child datasets

setDatasetCalibration and exportDatasetCalibration now resolve the parent
dataset id (via datasetId.split('/')[0]) instead of using a per-camera child
id like <parent>/left, which has no multiCam metadata and caused import to
fail.

(cherry picked from commit 5a2279a1eacf78c5a6bf216a5e7e5b93f89f719b)
---
 client/platform/desktop/backend/native/common.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 1a36b19a3..8e799a0ca 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -1677,10 +1677,13 @@ async function setDatasetCalibration(
   datasetId: string,
   sourcePath: string,
 ): Promise<string> {
-  const projectDirInfo = await getValidatedProjectDir(settings, datasetId);
+  // A calibration belongs to the parent multicam dataset; the viewer may pass a
+  // per-camera child id (e.g. "<parent>/left").
+  const parentId = datasetId.split('/')[0];
+  const projectDirInfo = await getValidatedProjectDir(settings, parentId);
   const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
   if (!fullMeta.multiCam) {
-    throw new Error(`Dataset ${datasetId} is not a multi-camera/stereo dataset; cannot set a calibration file.`);
+    throw new Error(`Dataset ${parentId} is not a multi-camera/stereo dataset; cannot set a calibration file.`);
   }
   const calibrationPath = await prepareDatasetCalibration(
     settings,
@@ -1701,7 +1704,7 @@ async function exportDatasetCalibration(
   datasetId: string,
   destPath: string,
 ): Promise<string> {
-  const calibrationPath = await getDatasetCalibrationPath(settings, datasetId);
+  const calibrationPath = await getDatasetCalibrationPath(settings, datasetId.split('/')[0]);
   if (!calibrationPath) {
     throw new Error(`Dataset ${datasetId} has no camera/calibration file to export.`);
   }

From a1950217c30e63d383f7416757079183f5a7306e Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 10:14:10 -0400
Subject: [PATCH 06/25] Calibration: convert mislabeled files, retain original
 name, reset-length option, UI tweaks

prepareDatasetCalibration now validates JSON content and converts a binary file
mislabeled .json (e.g. an .npz copied to last_calibration.json); the last-used
backup keeps the source extension. The user's original calibration filename is
recorded (calibrationOriginalName) and shown in the menu/dialog. The Import menu
gains a 'Reset all length measurements' checkbox that clears length and
length_method across all tracks. The calibration button moved to the top toolbar
(icon-only, always shown on stereo), reads on dialog open, and the info dialog
text was updated.

(cherry picked from commit d092737f8c8603e4f5e28fbfe33a1fd5df335140)
---
 client/dive-common/apispec.ts                 |  3 +
 .../components/CalibrationDialog.vue          | 20 ++----
 .../components/CalibrationMenu.vue            | 36 ++++------
 .../components/ImportAnnotations.vue          | 19 +++++-
 client/dive-common/components/Viewer.vue      |  4 --
 .../utils/clearLengthAttributes.ts            | 37 ++++++----
 client/platform/desktop/backend/ipcService.ts |  5 +-
 .../backend/native/calibrationConvert.ts      | 50 ++++++++++++--
 .../platform/desktop/backend/native/common.ts | 67 +++++++++++++++----
 .../platform/desktop/backend/native/viame.ts  |  2 +-
 client/platform/desktop/constants.ts          |  7 +-
 .../frontend/components/ViewerLoader.vue      |  7 ++
 .../web-girder/views/ViewerLoader.vue         |  7 ++
 13 files changed, 185 insertions(+), 79 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index c23491764..424df138e 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -232,6 +232,9 @@ interface DatasetCalibrationResult {
   itemId?: string;
   /** Name of the calibration file currently associated with the dataset. */
   path?: string;
+  /** User's original calibration filename (may differ from `path` when the file
+   * was converted/normalized on import). */
+  originalName?: string;
 }
 
 interface Api {
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index c160f5265..ed9d6f912 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -27,15 +27,10 @@ export default defineComponent({
       emit('delete');
     };
 
-    const importCalibration = () => {
-
-    };
-
     return {
       close,
       downloadCalibration,
       deleteCalibration,
-      importCalibration,
     };
   },
 });
@@ -54,7 +49,7 @@ export default defineComponent({
           mdi-checkerboard
         </v-icon>
         <v-toolbar-title class="text-h6">
-          Cameras calibration
+          Camera Calibration Information
         </v-toolbar-title>
         <v-spacer />
         <v-btn icon small @click="close">
@@ -141,11 +136,12 @@ export default defineComponent({
           </v-row>
         </div>
         <div v-else>
-          <div class="text-subtitle-1 font-weight-bold mb-2">No calibration loaded</div>
+          <div class="text-subtitle-1 font-weight-bold mb-2">No Calibration Loaded</div>
           <div>
-            Calibration is needed to run stereoscopic pipelines.
+            Calibration is needed to run many stereoscopic pipelines.
+            <br>
             <br>
-            You can import a calibration manually, or run a calibration pipeline on a checkerboard image sequence or video.
+            You can import a calibration file manually via the Import button, or run a calibration pipeline on a checkerboard image sequence or video.
           </div>
         </div>
       </v-card-text>
@@ -163,12 +159,6 @@ export default defineComponent({
           </v-icon>
           Delete
         </v-btn>
-        <v-btn color="primary" :outlined="!!calibration" @click="importCalibration">
-          <v-icon left>
-            mdi-upload
-          </v-icon>
-          Import
-        </v-btn>
         <v-btn v-if="fileName && showDownload" color="primary" @click="downloadCalibration">
           <v-icon left>
             mdi-download
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index 0b7e3e682..a9d8b8be6 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -3,6 +3,7 @@ import {
   computed,
   defineComponent,
   ref,
+  watch,
 } from 'vue';
 
 import {
@@ -19,6 +20,7 @@ export default defineComponent({
   },
   props: {
     datasetId: { type: String, required: true },
+    buttonOptions: { type: Object, default: () => ({}) },
   },
   setup(props) {
     const showCalibrationDialog = ref(false);
@@ -32,8 +34,15 @@ export default defineComponent({
       calibrationResult.value = res ?? undefined;
     });
     refresh();
+    // The calibration may be imported elsewhere (the Import menu) while this
+    // component stays mounted, so re-fetch whenever the dialog is opened and
+    // when the dataset changes.
+    watch(() => showCalibrationDialog.value, (open) => { if (open) refresh(); });
+    watch(() => props.datasetId, () => refresh());
 
-    const calibrationFileName = computed(() => calibrationResult.value?.path);
+    const calibrationFileName = computed(
+      () => calibrationResult.value?.originalName ?? calibrationResult.value?.path,
+    );
 
     const onDownload = () => {
       downloadCalibration?.(props.datasetId);
@@ -66,10 +75,8 @@ export default defineComponent({
     >
       <template #activator="{ on }">
         <v-btn
-          color=""
-          class="calibration-icon mx-1 mode-button"
-          :class="{ 'not-calibrated': !calibrationResult }"
-          small
+          class="ma-0"
+          v-bind="buttonOptions"
           v-on="on"
           @click="showCalibrationDialog = true"
         >
@@ -96,22 +103,3 @@ export default defineComponent({
     />
   </div>
 </template>
-
-<style>
-.calibration-icon {
-  border-width: 1px;
-  padding: 3px;
-  font-size: 1.2em !important;
-  margin-top: -4px;
-}
-
-.not-calibrated {
-  border-color: orange !important;
-  color: orange !important;
-}
-
-.mode-button {
-  border: 1px solid grey;
-  min-width: 36px;
-}
-</style>
diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index d5bc3ab74..8be3e2f4f 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -71,6 +71,9 @@ export default defineComponent({
     const menuOpen = ref(false);
     const additive = ref(false);
     const additivePrepend = ref('');
+    // When importing a new camera file, optionally drop length measurements (and
+    // their length_method locks) computed against the previous calibration.
+    const resetLengths = ref(clientSettings.stereoSettings.clearLengthOnCameraFileLoad);
     const openUpload = async () => {
       try {
         const ret = await openFromDisk('annotation');
@@ -134,8 +137,8 @@ export default defineComponent({
         processing.value = true;
         await api.importCalibrationFile(props.datasetId, ret.filePaths[0]);
         // A new camera file invalidates length measurements from the prior
-        // calibration; clear them when the option is enabled.
-        if (clientSettings.stereoSettings.clearLengthOnCameraFileLoad) {
+        // calibration; clear them (and their length_method locks) when checked.
+        if (resetLengths.value) {
           const cleared = clearLengthAttributes(cameraStore);
           if (cleared > 0) {
             await save();
@@ -161,6 +164,7 @@ export default defineComponent({
       menuOpen,
       additive,
       additivePrepend,
+      resetLengths,
       sets,
       currentSet,
     };
@@ -313,6 +317,17 @@ export default defineComponent({
           <v-container>
             <v-col>
               <v-row>
+                <v-checkbox
+                  v-model="resetLengths"
+                  class="mt-0"
+                  hide-details
+                  dense
+                  label="Reset all length measurements"
+                  hint="Deletes existing length values from all tracks and detections."
+                  persistent-hint
+                />
+              </v-row>
+              <v-row class="mt-3">
                 <v-btn
                   depressed
                   block
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 9ef008a1d..805b9fe43 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -64,7 +64,6 @@ import MultiCamToolsVue from './MultiCamTools.vue';
 import MultiCamToolbar from './MultiCamToolbar.vue';
 import PrimaryAttributeTrackFilter from './PrimaryAttributeTrackFilter.vue';
 import UserSettingsDialog from './UserSettingsDialog.vue';
-import CalibrationMenu from './CalibrationMenu.vue';
 
 export interface ImageDataItem {
   url: string;
@@ -87,7 +86,6 @@ export default defineComponent({
     UserGuideButton,
     UserSettingsDialog,
     EditorMenu,
-    CalibrationMenu,
     MultiCamToolbar,
     PrimaryAttributeTrackFilter,
     TrackList,
@@ -1402,8 +1400,6 @@ export default defineComponent({
           </template>
         </v-select>
 
-        <CalibrationMenu :dataset-id="datasetId" v-if="showMultiCamToolbar && multiCamList.length > 1"></CalibrationMenu>
-
         <!-- <v-tooltip v-if="showMultiCamToolbar && multiCamList.length > 1"
           bottom
           :z-index="20">
diff --git a/client/dive-common/utils/clearLengthAttributes.ts b/client/dive-common/utils/clearLengthAttributes.ts
index 11d3ea989..0a82556fe 100644
--- a/client/dive-common/utils/clearLengthAttributes.ts
+++ b/client/dive-common/utils/clearLengthAttributes.ts
@@ -1,33 +1,44 @@
 import type { CameraStore, Track } from 'vue-media-annotator/index';
 
 export const LENGTH_ATTRIBUTE_KEY = 'length';
+export const LENGTH_METHOD_ATTRIBUTE_KEY = 'length_method';
 
 /**
- * Remove every per-track and per-detection attribute named 'length' across all
- * cameras in the store. Used when a new stereo camera/calibration file is loaded,
- * because existing length measurements were computed against the previous
- * calibration and are no longer valid.
+ * Remove the per-track and per-detection 'length' attribute (and, by default,
+ * the companion 'length_method' lock) across all cameras in the store. Used
+ * when a new stereo camera/calibration file is loaded, because existing length
+ * measurements were computed against the previous calibration and are no longer
+ * valid.
  *
  * Mutations go through the Track API so change-tracking and reactivity fire; the
  * caller is responsible for persisting the result (e.g. handler.save()).
  *
+ * @param cameraStore the camera store to clear
+ * @param clearMethod also clear the 'length_method' attribute (default true)
  * @returns the number of attribute values cleared.
  */
-export default function clearLengthAttributes(cameraStore: CameraStore): number {
+export default function clearLengthAttributes(
+  cameraStore: CameraStore,
+  clearMethod = true,
+): number {
+  const keys = clearMethod
+    ? [LENGTH_ATTRIBUTE_KEY, LENGTH_METHOD_ATTRIBUTE_KEY]
+    : [LENGTH_ATTRIBUTE_KEY];
   let cleared = 0;
   cameraStore.camMap.value.forEach((camera) => {
     camera.trackStore.annotationMap.forEach((annotation) => {
       const track = annotation as Track;
-      if (track.attributes && track.attributes[LENGTH_ATTRIBUTE_KEY] !== undefined) {
-        track.setAttribute(LENGTH_ATTRIBUTE_KEY, undefined);
-        cleared += 1;
-      }
-      track.features.forEach((feature, frame) => {
-        if (feature && feature.attributes
-          && feature.attributes[LENGTH_ATTRIBUTE_KEY] !== undefined) {
-          track.setFeatureAttribute(frame, LENGTH_ATTRIBUTE_KEY, undefined);
+      keys.forEach((key) => {
+        if (track.attributes && track.attributes[key] !== undefined) {
+          track.setAttribute(key, undefined);
           cleared += 1;
         }
+        track.features.forEach((feature, frame) => {
+          if (feature && feature.attributes && feature.attributes[key] !== undefined) {
+            track.setFeatureAttribute(frame, key, undefined);
+            cleared += 1;
+          }
+        });
       });
     });
   });
diff --git a/client/platform/desktop/backend/ipcService.ts b/client/platform/desktop/backend/ipcService.ts
index ee917afa2..ede4ca759 100644
--- a/client/platform/desktop/backend/ipcService.ts
+++ b/client/platform/desktop/backend/ipcService.ts
@@ -202,11 +202,12 @@ export default function register() {
 
   ipcMain.handle('get-last-calibration', async () => common.getLastCalibrationPath(settings.get()));
 
-  ipcMain.handle('save-calibration', async (_, { path }: { path: string }) => {
-    const savedPath = await common.saveLastCalibration(settings.get(), path);
+  ipcMain.handle('save-calibration', async (_, { path: sourcePath }: { path: string }) => {
+    const savedPath = await common.saveLastCalibration(settings.get(), sourcePath);
     const updatedIds = await common.applyCalibrationToUncalibratedStereoDatasets(
       settings.get(),
       savedPath,
+      path.basename(sourcePath),
     );
     return { savedPath, updatedDatasetIds: updatedIds };
   });
diff --git a/client/platform/desktop/backend/native/calibrationConvert.ts b/client/platform/desktop/backend/native/calibrationConvert.ts
index d821e6194..88f38a8f6 100644
--- a/client/platform/desktop/backend/native/calibrationConvert.ts
+++ b/client/platform/desktop/backend/native/calibrationConvert.ts
@@ -44,13 +44,44 @@ async function convertCalibrationToJson(
   return exitCode === 0 && produced;
 }
 
+/**
+ * True when a file can be parsed as JSON. Used to tell a real KWIVER JSON
+ * camera-rig from a binary calibration file (e.g. an .npz) that was merely
+ * named ".json".
+ */
+async function isValidJson(filePath: string): Promise<boolean> {
+  try {
+    await fs.readJSON(filePath);
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+/**
+ * True when the file starts with the ZIP local-file-header magic ("PK\x03\x04").
+ * NumPy .npz archives are ZIP files, so this catches an .npz mislabeled .json.
+ */
+async function looksLikeZip(filePath: string): Promise<boolean> {
+  const fd = await fs.open(filePath, 'r');
+  try {
+    const buf = Buffer.alloc(2);
+    await fs.read(fd, buf, 0, 2, 0);
+    return buf[0] === 0x50 && buf[1] === 0x4b;
+  } finally {
+    await fs.close(fd);
+  }
+}
+
 /**
  * Store a stereo calibration / camera file alongside a dataset's media and
  * normalize it to the JSON camera-rig format.
  *
  * The original file is always copied into the dataset directory (preserved).
- * Non-JSON formats are additionally converted to JSON via VIAME; the JSON copy
- * is used for pipelines when conversion succeeds, otherwise the original is used.
+ * Non-JSON formats — including files named ".json" that are actually binary
+ * (e.g. an .npz copied to last_calibration.json) — are converted to JSON via
+ * VIAME; the JSON copy is used for pipelines when conversion succeeds,
+ * otherwise the original is used.
  *
  * @returns absolute path of the calibration file the dataset should reference.
  */
@@ -63,12 +94,23 @@ async function prepareDatasetCalibration(
   if (npath.resolve(originalDest) !== npath.resolve(sourcePath)) {
     await fs.copy(sourcePath, originalDest, { overwrite: true });
   }
-  if (npath.extname(originalDest).toLowerCase() === '.json') {
+  const ext = npath.extname(originalDest).toLowerCase();
+  // A .json that actually parses as JSON is already the format we want.
+  if (ext === '.json' && await isValidJson(originalDest)) {
     return originalDest;
   }
   const base = npath.basename(originalDest, npath.extname(originalDest));
+  // convert_cam_format.py detects the input format by extension, so a binary
+  // file mislabeled ".json" must be given its true extension first.
+  let convertSource = originalDest;
+  if (ext === '.json' && await looksLikeZip(originalDest)) {
+    convertSource = npath.join(projectDirAbsPath, `${base}.npz`);
+    if (npath.resolve(convertSource) !== npath.resolve(originalDest)) {
+      await fs.copy(originalDest, convertSource, { overwrite: true });
+    }
+  }
   const jsonDest = npath.join(projectDirAbsPath, `${base}.json`);
-  const converted = await convertCalibrationToJson(settings, originalDest, jsonDest);
+  const converted = await convertCalibrationToJson(settings, convertSource, jsonDest);
   return converted ? jsonDest : originalDest;
 }
 
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 8e799a0ca..56623d8a2 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -46,7 +46,7 @@ import {
   RunTraining, ExportDatasetArgs, DesktopMediaImportResponse,
   ExportConfigurationArgs, JobsFolderName, JobsOutputFolderName, ProjectsFolderName,
   PipelinesFolderName, ConversionArgs,
-  JobType, LastCalibrationFileName,
+  JobType, LastCalibrationBaseName,
 } from 'platform/desktop/constants';
 import {
   cleanString, filterByGlob, makeid, strNumericCompare,
@@ -1421,6 +1421,7 @@ async function finalizeMediaImport(
   // Store any stereo calibration / camera file alongside the media and normalize
   // it to the VIAME JSON camera-rig format (keeping the original).
   if (jsonMeta.multiCam?.calibration) {
+    jsonMeta.multiCam.calibrationOriginalName = realCalibrationName(jsonMeta.multiCam.calibration);
     jsonMeta.multiCam.calibration = await prepareDatasetCalibration(
       settings,
       projectDirAbsPath,
@@ -1576,38 +1577,65 @@ async function exportConfiguration(settings: Settings, args: ExportConfiguration
 }
 
 /**
- * Get path to last_calibration.json if it exists
+ * The user's calibration filename, unless it is DIVE's internal
+ * `last_calibration.*` backup (which carries no meaningful original name).
+ */
+function realCalibrationName(name?: string | null): string | undefined {
+  if (!name) return undefined;
+  const base = npath.basename(name);
+  if (base.toLowerCase().startsWith(`${LastCalibrationBaseName}.`)) return undefined;
+  return base;
+}
+
+/**
+ * Get path to the saved "last used" calibration (last_calibration.*) if it
+ * exists. The stored file keeps the source's real extension, so we match on the
+ * basename rather than a fixed filename.
  * @returns path to last calibration file or null if it doesn't exist
  */
 async function getLastCalibrationPath(settings: Settings): Promise<string | null> {
-  const calibrationPath = npath.join(settings.dataPath, LastCalibrationFileName);
-  if (await fs.pathExists(calibrationPath)) {
-    return calibrationPath;
-  }
-  return null;
+  if (!(await fs.pathExists(settings.dataPath))) return null;
+  const entries = await fs.readdir(settings.dataPath);
+  const match = entries.find(
+    (f) => npath.basename(f, npath.extname(f)) === LastCalibrationBaseName,
+  );
+  return match ? npath.join(settings.dataPath, match) : null;
 }
 
 /**
- * Save a calibration file as the last used calibration
+ * Save a calibration file as the last used calibration, preserving the source
+ * file's extension (e.g. last_calibration.npz) so its real format is retained.
  * @param settings app settings
  * @param sourcePath path to the source calibration file
  * @returns path to the saved calibration file
  */
 async function saveLastCalibration(settings: Settings, sourcePath: string): Promise<string> {
-  const destPath = npath.join(settings.dataPath, LastCalibrationFileName);
+  const ext = npath.extname(sourcePath) || '.json';
+  // Remove any prior backup with a different extension to avoid stale duplicates.
+  if (await fs.pathExists(settings.dataPath)) {
+    const entries = await fs.readdir(settings.dataPath);
+    await Promise.all(entries
+      .filter((f) => npath.basename(f, npath.extname(f)) === LastCalibrationBaseName)
+      .map((f) => fs.remove(npath.join(settings.dataPath, f))));
+  }
+  const destPath = npath.join(settings.dataPath, `${LastCalibrationBaseName}${ext}`);
   await fs.copy(sourcePath, destPath, { overwrite: true });
   return destPath;
 }
 
 /**
- * Apply calibration to all stereo datasets that don't already have calibration set
+ * Apply calibration to all stereo datasets that don't already have calibration set.
+ * The source is copied into each dataset and normalized to JSON, and the user's
+ * original filename is recorded for display.
  * @param settings app settings
  * @param calibrationPath path to the calibration file to apply
+ * @param originalName user's original calibration filename (for display)
  * @returns list of dataset IDs that were updated
  */
 async function applyCalibrationToUncalibratedStereoDatasets(
   settings: Settings,
   calibrationPath: string,
+  originalName?: string,
 ): Promise<string[]> {
   const datasets = await autodiscoverData(settings);
   const updatedIds: string[] = [];
@@ -1622,7 +1650,14 @@ async function applyCalibrationToUncalibratedStereoDatasets(
         // eslint-disable-next-line no-await-in-loop
         const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
         if (fullMeta.multiCam) {
-          fullMeta.multiCam.calibration = calibrationPath;
+          // eslint-disable-next-line no-await-in-loop
+          fullMeta.multiCam.calibration = await prepareDatasetCalibration(
+            settings,
+            projectDirInfo.basePath,
+            calibrationPath,
+          );
+          fullMeta.multiCam.calibrationOriginalName = realCalibrationName(originalName)
+            ?? realCalibrationName(calibrationPath);
           // eslint-disable-next-line no-await-in-loop
           await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
           updatedIds.push(meta.id);
@@ -1691,6 +1726,7 @@ async function setDatasetCalibration(
     sourcePath,
   );
   fullMeta.multiCam.calibration = calibrationPath;
+  fullMeta.multiCam.calibrationOriginalName = realCalibrationName(sourcePath);
   await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
   return calibrationPath;
 }
@@ -1754,11 +1790,16 @@ async function getDatasetCalibration(
   settings: Settings,
   datasetId: string,
 ): Promise<DatasetCalibrationResult | null> {
-  const calibrationPath = await getDatasetCalibrationPath(settings, datasetId.split('/')[0]);
+  const projectDirInfo = await getValidatedProjectDir(settings, datasetId.split('/')[0]);
+  const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
+  const calibrationPath = fullMeta.multiCam?.calibration;
   if (!calibrationPath || !(await fs.pathExists(calibrationPath))) {
     return null;
   }
-  const result: DatasetCalibrationResult = { path: npath.basename(calibrationPath) };
+  const result: DatasetCalibrationResult = {
+    path: npath.basename(calibrationPath),
+    originalName: realCalibrationName(fullMeta.multiCam?.calibrationOriginalName),
+  };
   if (npath.extname(calibrationPath).toLowerCase() === '.json') {
     try {
       const data = await fs.readJSON(calibrationPath);
diff --git a/client/platform/desktop/backend/native/viame.ts b/client/platform/desktop/backend/native/viame.ts
index 9c83fdbef..ace6cb1ff 100644
--- a/client/platform/desktop/backend/native/viame.ts
+++ b/client/platform/desktop/backend/native/viame.ts
@@ -386,7 +386,7 @@ async function runPipeline(
           if (calibrationFile) {
             const calibrationPath = npath.join(jobWorkDir, calibrationFile);
             const savedPath = await common.saveLastCalibration(settings, calibrationPath);
-            await common.applyCalibrationToUncalibratedStereoDatasets(settings, savedPath);
+            await common.applyCalibrationToUncalibratedStereoDatasets(settings, savedPath, calibrationFile);
           }
         }
 
diff --git a/client/platform/desktop/constants.ts b/client/platform/desktop/constants.ts
index 3d5f00508..027862da2 100644
--- a/client/platform/desktop/constants.ts
+++ b/client/platform/desktop/constants.ts
@@ -13,7 +13,9 @@ export const ProjectsFolderName = 'DIVE_Projects';
 export const JobsFolderName = 'DIVE_Jobs';
 export const JobsOutputFolderName = 'DIVE_Jobs_Output';
 export const PipelinesFolderName = 'DIVE_Pipelines';
-export const LastCalibrationFileName = 'last_calibration.json';
+// Basename (without extension) of the saved "most recently used" calibration.
+// The stored file keeps the source file's real extension (e.g. last_calibration.npz).
+export const LastCalibrationBaseName = 'last_calibration';
 
 export interface Settings {
   // version a schema version
@@ -50,6 +52,9 @@ export interface MultiCamDesktop {
   cameras: Record<string, Camera>;
   //Calibration file in .npz format used for stereo or other cameras
   calibration?: string;
+  // Name of the user's original calibration file (preserved for display, since
+  // `calibration` may point at a converted/normalized copy).
+  calibrationOriginalName?: string;
   // Default Display Key for showing multiCam
   defaultDisplay: string;
 }
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index 80ba6c127..1160ae8c6 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -5,6 +5,7 @@ import {
 import Viewer from 'dive-common/components/Viewer.vue';
 import RunPipelineMenu from 'dive-common/components/RunPipelineMenu.vue';
 import ImportAnnotations from 'dive-common//components/ImportAnnotations.vue';
+import CalibrationMenu from 'dive-common/components/CalibrationMenu.vue';
 import SidebarContext from 'dive-common/components/SidebarContext.vue';
 import context from 'dive-common/store/context';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
@@ -32,6 +33,7 @@ export default defineComponent({
     SidebarContext,
     Viewer,
     ImportAnnotations,
+    CalibrationMenu,
     ...context.getComponents(),
   },
   props: {
@@ -173,6 +175,11 @@ export default defineComponent({
         :time-filter="timeFilter"
         v-bind="{ buttonOptions, menuOptions }"
       />
+      <CalibrationMenu
+        v-if="subTypeList[0] === 'stereo'"
+        :dataset-id="modifiedId"
+        :button-options="buttonOptions"
+      />
       <ImportAnnotations
         :dataset-id="modifiedId"
         :sub-type="subTypeList[0]"
diff --git a/client/platform/web-girder/views/ViewerLoader.vue b/client/platform/web-girder/views/ViewerLoader.vue
index a70168efc..60ed2ae54 100644
--- a/client/platform/web-girder/views/ViewerLoader.vue
+++ b/client/platform/web-girder/views/ViewerLoader.vue
@@ -7,6 +7,7 @@ import Viewer from 'dive-common/components/Viewer.vue';
 import NavigationTitle from 'dive-common/components/NavigationTitle.vue';
 import RunPipelineMenu from 'dive-common/components/RunPipelineMenu.vue';
 import ImportAnnotations from 'dive-common/components/ImportAnnotations.vue';
+import CalibrationMenu from 'dive-common/components/CalibrationMenu.vue';
 import SidebarContext from 'dive-common/components/SidebarContext.vue';
 import context from 'dive-common/store/context';
 import { useBrand } from 'platform/web-girder/store/useBrand';
@@ -64,6 +65,7 @@ export default defineComponent({
     NavigationTitle,
     Viewer,
     ImportAnnotations,
+    CalibrationMenu,
     RevisionHistory,
     SidebarContext,
     ViewerAlert,
@@ -304,6 +306,11 @@ export default defineComponent({
         :time-filter="timeFilter"
         :exclude-pipeline-terms="webExcludedPipelineTerms"
       />
+      <CalibrationMenu
+        v-if="subTypeList[0] === 'stereo'"
+        :dataset-id="id"
+        :button-options="buttonOptions"
+      />
       <ImportAnnotations
         :button-options="buttonOptions"
         :menu-options="menuOptions"

From a869b4a05d5ace577df47d54909b4f9ec487b3b9 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 10:34:12 -0400
Subject: [PATCH 07/25] Refine calibration import dialog labels and layout

Move the reset-length checkbox below the camera-file Import button (matching the
annotation-import layout), relabel buttons/sections, stop showing the loaded
calibration filename, and drop the JSON-conversion mention.

(cherry picked from commit 39aff5c5a7a42a3aaa786749e921bbc43e0a7475)
---
 .../components/ImportAnnotations.vue          | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index 8be3e2f4f..6cf12421a 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -217,12 +217,12 @@ export default defineComponent({
         outlined
       >
         <v-card-title>
-          Import Formats
+          Import Annotations
         </v-card-title>
         <v-card-text>
           Multiple Data types can be imported:
           <ul>
-            <li> Viame CSV Files </li>
+            <li> VIAME CSV Files </li>
             <li> DIVE Annotation JSON </li>
             <li> DIVE Configuration JSON</li>
             <li> COCO / KWCOCO JSON files </li>
@@ -297,11 +297,11 @@ export default defineComponent({
         <template v-if="cameraFileSupported">
           <v-divider />
           <v-card-title class="pt-3">
-            Camera File
+            Import Camera File
           </v-card-title>
           <v-card-text class="pb-0">
             <div v-if="currentCalibrationName">
-              Loaded: <strong>{{ currentCalibrationName }}</strong>
+              A camera file is loaded.
             </div>
             <div
               v-else
@@ -310,33 +310,27 @@ export default defineComponent({
               No camera file loaded.
             </div>
             <div class="caption pt-1">
-              Import any VIAME-supported stereo calibration; it is converted to the
-              JSON camera format and stored with the dataset.
+              Import any VIAME-supported stereo calibration; it is stored with the dataset.
             </div>
           </v-card-text>
           <v-container>
             <v-col>
               <v-row>
-                <v-checkbox
-                  v-model="resetLengths"
-                  class="mt-0"
-                  hide-details
-                  dense
-                  label="Reset all length measurements"
-                  hint="Deletes existing length values from all tracks and detections."
-                  persistent-hint
-                />
-              </v-row>
-              <v-row class="mt-3">
                 <v-btn
                   depressed
                   block
                   :disabled="!datasetId || processing"
                   @click="openCalibrationUpload"
                 >
-                  Import Camera File
+                  Import
                 </v-btn>
               </v-row>
+              <v-row>
+                <v-checkbox
+                  v-model="resetLengths"
+                  label="Reset length measurements"
+                />
+              </v-row>
             </v-col>
           </v-container>
         </template>

From 7b7cd206bf81076819e341dccfa2695268160ee3 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 10:59:54 -0400
Subject: [PATCH 08/25] Fix lint in getDatasetCalibration request params

---
 client/platform/web-girder/api/dataset.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/platform/web-girder/api/dataset.service.ts b/client/platform/web-girder/api/dataset.service.ts
index 399b5ee5c..b2c6078b8 100644
--- a/client/platform/web-girder/api/dataset.service.ts
+++ b/client/platform/web-girder/api/dataset.service.ts
@@ -81,7 +81,7 @@ function clone({
 
 function getDatasetCalibration(datasetId: string) {
   return girderRest.get('dive_dataset/calibration', {
-    params: {folderId: datasetId}
+    params: { folderId: datasetId },
   });
 }
 

From 1c88a806f34807ef08007134866678d653ecf082 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 11:06:32 -0400
Subject: [PATCH 09/25] Fix lint errors in CalibrationDialog (v-for keys,
 unused vars, formatting)

---
 .../components/CalibrationDialog.vue          | 67 +++++++++++++------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index ed9d6f912..f13470856 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -3,7 +3,6 @@ import { DatasetStereoCalibration } from 'dive-common/apispec';
 import {
   defineComponent,
   PropType,
-  ref,
 } from 'vue';
 
 export default defineComponent({
@@ -63,13 +62,19 @@ export default defineComponent({
           <span>{{ fileName }}</span>
         </div>
         <div v-if="calibration" class="mb-6">
-          <div class="text-subtitle-1 font-weight-bold mb-2">General</div>
+          <div class="text-subtitle-1 font-weight-bold mb-2">
+            General
+          </div>
           <v-simple-table dense class="mb-4 elevation-1">
-            <template v-slot:default>
+            <template #default>
               <thead>
                 <tr>
-                  <th class="text-left">Parameter</th>
-                  <th class="text-left">Value</th>
+                  <th class="text-left">
+                    Parameter
+                  </th>
+                  <th class="text-left">
+                    Value
+                  </th>
                 </tr>
               </thead>
               <tbody>
@@ -81,45 +86,65 @@ export default defineComponent({
             </template>
           </v-simple-table>
 
-          <div class="text-subtitle-1 font-weight-bold mb-2">Intrinsics</div>
+          <div class="text-subtitle-1 font-weight-bold mb-2">
+            Intrinsics
+          </div>
           <v-simple-table dense class="mb-4 elevation-1">
-            <template v-slot:default>
+            <template #default>
               <thead>
                 <tr>
-                  <th class="text-left">Property</th>
-                  <th v-for="(_, cameraName, __) in calibration.calibrations" class="text-left">{{ cameraName }} camera</th>
+                  <th class="text-left">
+                    Property
+                  </th>
+                  <th v-for="(_, cameraName) in calibration.calibrations" :key="cameraName" class="text-left">
+                    {{ cameraName }} camera
+                  </th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
                   <td><strong>Focal (fx, fy)</strong></td>
-                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.fx }} , {{ calib.fy }}</td>
+                  <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
+                    {{ calib.fx }} , {{ calib.fy }}
+                  </td>
                 </tr>
                 <tr>
                   <td><strong>Optical center (cx, cy)</strong></td>
-                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.cx }} , {{ calib.cy }}</td>
+                  <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
+                    {{ calib.cx }} , {{ calib.cy }}
+                  </td>
                 </tr>
                 <tr>
                   <td><strong>Radial Distortion (k1, k2, k3)</strong></td>
-                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.k1 }} , {{ calib.k2 }} , {{ calib.k3 }}</td>
+                  <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
+                    {{ calib.k1 }} , {{ calib.k2 }} , {{ calib.k3 }}
+                  </td>
                 </tr>
                 <tr>
                   <td><strong>Tangential Distortion (p1, p2)</strong></td>
-                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.p1 }} , {{ calib.p2 }}</td>
+                  <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
+                    {{ calib.p1 }} , {{ calib.p2 }}
+                  </td>
                 </tr>
                 <tr>
                   <td><strong>RMS Error</strong></td>
-                  <td v-for="(calib, cameraName, index) in calibration.calibrations">{{ calib.rmsError }}</td>
+                  <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
+                    {{ calib.rmsError }}
+                  </td>
                 </tr>
               </tbody>
             </template>
           </v-simple-table>
-          
-          <div class="text-subtitle-1 font-weight-bold mb-2">Extrinsics</div>
+
+          <div class="text-subtitle-1 font-weight-bold mb-2">
+            Extrinsics
+          </div>
           <v-row>
             <v-col cols="12" md="6">
               <v-card outlined class="pa-2 text-caption font-mono">
-                <div class="font-weight-bold mb-1">Translation T (mm):</div>
+                <div class="font-weight-bold mb-1">
+                  Translation T (mm):
+                </div>
                 X: {{ calibration.T[0] }}<br>
                 Y: {{ calibration.T[1] }}<br>
                 Z: {{ calibration.T[2] }}
@@ -127,7 +152,9 @@ export default defineComponent({
             </v-col>
             <v-col cols="12" md="6">
               <v-card outlined class="pa-2 text-caption font-mono">
-                <div class="font-weight-bold mb-1">Rotation R:</div>
+                <div class="font-weight-bold mb-1">
+                  Rotation R:
+                </div>
                 [{{ calibration.R[0].toFixed(4) }}, {{ calibration.R[1].toFixed(4) }}, {{ calibration.R[2].toFixed(4) }}]<br>
                 [{{ calibration.R[3].toFixed(4) }}, {{ calibration.R[4].toFixed(4) }}, {{ calibration.R[5].toFixed(4) }}]<br>
                 [{{ calibration.R[6].toFixed(4) }}, {{ calibration.R[7].toFixed(4) }}, {{ calibration.R[8].toFixed(4) }}]
@@ -136,7 +163,9 @@ export default defineComponent({
           </v-row>
         </div>
         <div v-else>
-          <div class="text-subtitle-1 font-weight-bold mb-2">No Calibration Loaded</div>
+          <div class="text-subtitle-1 font-weight-bold mb-2">
+            No Calibration Loaded
+          </div>
           <div>
             Calibration is needed to run many stereoscopic pipelines.
             <br>

From 50bfdb625dcb0103d4258b325a408b5a5dda00a9 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 11:16:59 -0400
Subject: [PATCH 10/25] Web: report calibration filename when params can't be
 parsed

get_calibration no longer 400s/500s for a non-JSON (e.g. .npz) or malformed
calibration file; it returns the item id and filename so the viewer shows the
calibration as loaded, mirroring desktop's graceful handling.
---
 server/dive_server/crud_dataset.py | 33 ++++++++++++++++++++----------
 server/dive_utils/types.py         |  4 +++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index 7475a48bb..a7a93d4ef 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -1157,13 +1157,16 @@ def get_calibration(
 
     calibration_item = Item().load(calibration_item_id, level=AccessType.READ, user=user)
 
-    files = Item().childFiles(calibration_item)
-    for file in files:
-        file_name = file['name']
-        file_name.endswith('.json')
-
-        if file_name.endswith('.json'):
-            with File().open(file) as fh:
+    files = list(Item().childFiles(calibration_item))
+    json_file = next((f for f in files if f['name'].endswith('.json')), None)
+    # File name reported even when parameters can't be parsed (e.g. an .npz or an
+    # unsupported/corrupt file) so the viewer still shows the calibration as loaded.
+    fallback = json_file or (files[0] if files else None) or calibration_item
+    fallback_name = fallback['name']
+
+    if json_file is not None:
+        try:
+            with File().open(json_file) as fh:
                 chunks = []
                 while True:
                     chunk = fh.read(4096)
@@ -1213,8 +1216,16 @@ def get_calibration(
 
             return types.DatasetCalibrationResult(
                 calibration=dataset_calibration,
-                itemId=calibration_item['_id'],
-                path=file_name,
+                itemId=str(calibration_item['_id']),
+                path=json_file['name'],
             )
-
-    raise RestException('Calibration file not supported', code=400)
+        except (ValueError, KeyError, UnicodeDecodeError):
+            # Present-but-unparseable JSON: fall through to a filename-only result.
+            pass
+
+    # A calibration file is attached but its parameters can't be parsed (non-JSON
+    # such as .npz, or malformed). Report its presence and name.
+    return types.DatasetCalibrationResult(
+        itemId=str(calibration_item['_id']),
+        path=fallback_name,
+    )
diff --git a/server/dive_utils/types.py b/server/dive_utils/types.py
index 4b779597d..70627137e 100644
--- a/server/dive_utils/types.py
+++ b/server/dive_utils/types.py
@@ -208,7 +208,9 @@ class DatasetStereoCalibration(TypedDict):
 
 
 class DatasetCalibrationResult(TypedDict):
-    calibration: DatasetStereoCalibration
+    # `calibration` is absent when the stored file isn't a parseable JSON
+    # camera-rig (e.g. an .npz); the file name is still reported via `path`.
+    calibration: NotRequired[DatasetStereoCalibration]
     itemId: str
     path: str
 

From f44f268457607f002797ba454e7975e0bfb8c51c Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 11:34:16 -0400
Subject: [PATCH 11/25] Web: in-viewer calibration import with length reset

Add a POST dive_dataset/:id/calibration endpoint and crud_dataset.set_calibration
that marks an uploaded file as the dataset's stereo calibration (replacing any
prior). Implement web importCalibrationFile (upload to the dataset folder, then
mark) and wire it into provideApi, which enables the shared Import Camera File
section and the reset-length checkbox on web.
---
 client/platform/web-girder/App.vue            |  2 +
 .../web-girder/multicamFileRegistry.ts        | 29 ++++++++++++-
 server/dive_server/crud_dataset.py            | 42 +++++++++++++++++++
 server/dive_server/views_dataset.py           | 14 +++++++
 4 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/client/platform/web-girder/App.vue b/client/platform/web-girder/App.vue
index a7be4d998..8786b2321 100644
--- a/client/platform/web-girder/App.vue
+++ b/client/platform/web-girder/App.vue
@@ -37,6 +37,7 @@ import {
   openFromDiskWithRegistry,
   saveCalibration,
   stashCalibrationFile,
+  importCalibrationFile,
 } from './multicamFileRegistry';
 import { reportHandledPromiseRejection } from './reportHandledPromiseRejection';
 
@@ -76,6 +77,7 @@ export default defineComponent({
       getLastCalibration,
       saveCalibration,
       stashCalibrationFile,
+      importCalibrationFile,
       importAnnotationFile,
       getTiles,
       getTileURL,
diff --git a/client/platform/web-girder/multicamFileRegistry.ts b/client/platform/web-girder/multicamFileRegistry.ts
index 296fed24a..f7806f66f 100644
--- a/client/platform/web-girder/multicamFileRegistry.ts
+++ b/client/platform/web-girder/multicamFileRegistry.ts
@@ -1,6 +1,8 @@
 /** Stash browser File selections for multicam import (paths are not filesystem paths on web). */
 
-import { openFromDisk } from './utils';
+import { Location } from '@girder/components/src';
+import girderRest from 'platform/web-girder/plugins/girder';
+import { openFromDisk, GirderUploadManager } from './utils';
 
 const LAST_CALIBRATION_STORAGE_KEY = 'dive_web_last_calibration';
 
@@ -170,3 +172,28 @@ export function saveCalibration(path: string): Promise<{ savedPath: string; upda
   localStorage.setItem(LAST_CALIBRATION_STORAGE_KEY, savedPath);
   return Promise.resolve({ savedPath, updatedDatasetIds: [] });
 }
+
+/**
+ * Upload a calibration file (previously chosen via openFromDiskWithRegistry, so its
+ * File is stashed under `fileName`) into the dataset's Girder folder and mark it as
+ * the dataset's stereoscopic calibration.
+ */
+export async function importCalibrationFile(
+  datasetId: string,
+  fileName: string,
+): Promise<{ calibration: string }> {
+  const file = getCalibrationFile(fileName);
+  if (!file) {
+    throw new Error(`Calibration file "${fileName}" is no longer available; please re-select it.`);
+  }
+  const manager = new GirderUploadManager(file, {
+    $rest: girderRest,
+    parent: { _id: datasetId, _modelType: 'folder' } as Location,
+  });
+  const uploaded = await manager.start() as { _id: string };
+  await girderRest.post(`dive_dataset/${datasetId}/calibration`, null, {
+    params: { fileId: uploaded._id },
+  });
+  localStorage.setItem(LAST_CALIBRATION_STORAGE_KEY, file.name);
+  return { calibration: file.name };
+}
diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index a7a93d4ef..b31c3bd36 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -1229,3 +1229,45 @@ def get_calibration(
         itemId=str(calibration_item['_id']),
         path=fallback_name,
     )
+
+
+def set_calibration(
+    user: types.GirderUserModel,
+    folder: types.GirderModel,
+    file_id: str,
+) -> dict:
+    """
+    Mark an already-uploaded Girder file as the dataset's stereoscopic calibration.
+
+    The file must live in the dataset (multicam parent) folder root. Any previously
+    marked calibration item in that root is unmarked so the newest selection wins.
+    """
+    if fromMeta(folder, "type", required=True) != constants.MultiType:
+        raise RestException('Calibration is only supported for stereo/multicam datasets', code=400)
+
+    file = File().load(file_id, level=AccessType.READ, user=user)
+    if file is None:
+        raise RestException('Calibration file was not found', code=404)
+    if not constants.stereoCalibrationRegex.search(file['name']):
+        raise RestException(
+            'Calibration file must be .npz, .json, .cam, .yml, or .zip',
+            code=400,
+        )
+
+    cal_item = Item().load(file['itemId'], level=AccessType.WRITE, user=user)
+    if cal_item is None or str(cal_item.get('folderId')) != str(folder['_id']):
+        raise RestException('Calibration file must be stored in the dataset folder', code=400)
+
+    # Unmark any prior calibration items so find_calibration_item_id picks the new one.
+    for prior in _calibration_items_in_folder_root(str(folder['_id'])):
+        if str(prior['_id']) != str(cal_item['_id']):
+            Item().setMetadata(prior, {constants.CalibrationFileMarker: False})
+
+    Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
+
+    multi_cam = dict(folder['meta'].get(constants.MultiCamMarker, {}))
+    multi_cam[constants.CalibrationItemIdMarker] = str(cal_item['_id'])
+    folder['meta'][constants.MultiCamMarker] = multi_cam
+    Folder().save(folder)
+
+    return {'calibrationItemId': str(cal_item['_id'])}
diff --git a/server/dive_server/views_dataset.py b/server/dive_server/views_dataset.py
index 8e7dce9f1..7978590f0 100644
--- a/server/dive_server/views_dataset.py
+++ b/server/dive_server/views_dataset.py
@@ -38,6 +38,7 @@ def __init__(self, resourceName):
         self.route("GET", (), self.list_datasets)
         self.route("GET", (":id",), self.get_meta)
         self.route("GET", ("calibration",), self.get_dataset_calibration)
+        self.route("POST", (":id", "calibration"), self.set_dataset_calibration)
         self.route("GET", (":id", "media"), self.get_media)
         self.route("GET", ("export",), self.export)
         self.route("GET", (":id", "configuration"), self.get_configuration)
@@ -222,6 +223,19 @@ def get_dataset_calibration(
             self.getCurrentUser(), folder
         )
 
+    @access.user
+    @autoDescribeRoute(
+        Description("Set the stereoscopic calibration file for a dataset")
+        .modelParam("id", level=AccessType.WRITE, **DatasetModelParam)
+        .param(
+            "fileId",
+            "Girder file id of a calibration file already uploaded to the dataset folder",
+            required=True,
+        )
+    )
+    def set_dataset_calibration(self, folder, fileId):
+        return crud_dataset.set_calibration(self.getCurrentUser(), folder, fileId)
+
     @access.public(scope=TokenScope.DATA_READ, cookie=True)
     @rawResponse
     @autoDescribeRoute(

From accae28ca02ddac67c51a8e5402af845e08386fc Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 12:22:25 -0400
Subject: [PATCH 12/25] Web: convert non-JSON calibration to JSON via worker
 task

Add a convert_calibration celery task that runs VIAME's convert_cam_format.py on
the worker (download item -> convert npz/yml/etc -> upload .json into the same
item), so the viewer can display calibration parameters. Enqueued from
set_calibration and multicam creation when the uploaded file isn't already JSON;
best-effort since stereo pipelines read the original file directly.
---
 server/dive_server/crud_dataset.py | 41 ++++++++++++++++++-
 server/dive_tasks/tasks.py         | 65 ++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index b31c3bd36..a3790fd51 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -10,10 +10,12 @@
 from girder.models.folder import Folder
 from girder.models.item import Item
 from girder.models.file import File
+from girder.models.token import Token
 from girder.utility import ziputil
 from pydantic.main import BaseModel
 
 from dive_server import crud, crud_annotation
+from dive_tasks import tasks
 from dive_utils import TRUTHY_META_VALUES, asbool, constants, fromMeta, models, types
 from dive_utils.serializers import kwcoco
 
@@ -1064,6 +1066,8 @@ def create_multicam(
             )
         Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
         calibration_item_id = str(cal_item['_id'])
+        if not cal_item['name'].lower().endswith('.json'):
+            enqueue_calibration_conversion(user, calibration_item_id, cal_item['name'])
 
     parent_folder_doc['meta'] = {
         constants.DatasetMarker: True,
@@ -1149,8 +1153,10 @@ def get_calibration(
     dataset_type = fromMeta(folder, "type", required=True)
 
     if dataset_type != constants.MultiType:
-        raise RestException('Cannot search for calibration file on non stereo/multicam datasets', code=400)
-    
+        raise RestException(
+            'Cannot search for calibration file on non stereo/multicam datasets', code=400
+        )
+
     calibration_item_id = find_calibration_item_id(folder_id_str)
     if calibration_item_id is None:
         return None
@@ -1231,6 +1237,33 @@ def get_calibration(
     )
 
 
+def enqueue_calibration_conversion(
+    user: types.GirderUserModel,
+    item_id: str,
+    item_name: str,
+) -> None:
+    """
+    Kick off a background worker job to convert a non-JSON calibration file to the
+    JSON camera-rig format (for display). The pipeline can consume the original file
+    directly, so this is best-effort and never blocks the request.
+    """
+    queue = (
+        f'{user["login"]}@private'
+        if user.get(constants.UserPrivateQueueEnabledMarker, False)
+        else 'celery'
+    )
+    token = Token().createToken(user=user, days=1)
+    tasks.convert_calibration.apply_async(
+        queue=queue,
+        kwargs=dict(
+            itemId=item_id,
+            girder_job_title=f"Converting calibration {item_name}",
+            girder_client_token=str(token["_id"]),
+            girder_job_type="private",
+        ),
+    )
+
+
 def set_calibration(
     user: types.GirderUserModel,
     folder: types.GirderModel,
@@ -1270,4 +1303,8 @@ def set_calibration(
     folder['meta'][constants.MultiCamMarker] = multi_cam
     Folder().save(folder)
 
+    # Non-JSON formats (e.g. .npz) need conversion before parameters can be displayed.
+    if not file['name'].lower().endswith('.json'):
+        enqueue_calibration_conversion(user, str(cal_item['_id']), cal_item['name'])
+
     return {'calibrationItemId': str(cal_item['_id'])}
diff --git a/server/dive_tasks/tasks.py b/server/dive_tasks/tasks.py
index b68b68f94..439d72aae 100644
--- a/server/dive_tasks/tasks.py
+++ b/server/dive_tasks/tasks.py
@@ -721,6 +721,71 @@ def train_pipeline(self: Task, params: TrainingJob):
         gc.upload(f"{training_results_path}/*", girder_output_folder["_id"])
 
 
+@app.task(bind=True, acks_late=True, ignore_result=True)
+def convert_calibration(self: Task, itemId: str):
+    """
+    Convert a stereoscopic calibration file (npz/yml/mat/cam/zip) stored in a Girder
+    item to the KWIVER JSON camera-rig format, uploading the JSON into the same item
+    so the viewer can display calibration parameters. No-op when the item already has
+    a .json camera-rig.
+    """
+    conf = Config()
+    conf.require_viame_install()
+    context: dict = {}
+    gc: GirderClient = self.girder_client
+    manager: JobManager = patch_manager(self.job_manager)
+    if utils.check_canceled(self, context):
+        manager.updateStatus(JobStatus.CANCELED)
+        return
+
+    convert_tool = conf.viame_install_path / 'configs' / 'convert_cam_format.py'
+
+    with tempfile.TemporaryDirectory() as _working_directory, suppress(utils.CanceledError):
+        _working_directory_path = Path(_working_directory)
+        item: GirderModel = gc.getItem(itemId)
+        files = list(gc.listFile(itemId))
+
+        if any(f['name'].lower().endswith('.json') for f in files):
+            manager.write('Calibration item already has a JSON camera-rig; skipping.\n')
+            return
+
+        source_file = next(
+            (f for f in files if constants.stereoCalibrationRegex.search(f['name'])),
+            None,
+        )
+        if source_file is None:
+            manager.write('No convertible calibration file found in item; skipping.\n')
+            return
+
+        manager.updateStatus(JobStatus.FETCHING_INPUT)
+        gc.downloadItem(itemId, _working_directory_path, name=item.get('name'))
+        input_path = _working_directory_path / source_file['name']
+        output_path = input_path.with_suffix('.json')
+
+        manager.updateStatus(JobStatus.RUNNING)
+        command = [
+            f". {shlex.quote(str(conf.viame_setup_script))} &&",
+            "python",
+            shlex.quote(str(convert_tool)),
+            shlex.quote(str(input_path)),
+            shlex.quote(str(output_path)),
+        ]
+        popen_kwargs = {
+            'args': " ".join(command),
+            'shell': True,
+            'executable': '/bin/bash',
+            'cwd': str(_working_directory_path),
+            'env': conf.gpu_process_env,
+        }
+        utils.stream_subprocess(self, context, manager, popen_kwargs)
+
+        if not output_path.exists() or not output_path.stat().st_size:
+            raise RuntimeError('Calibration conversion produced no JSON output')
+
+        manager.updateStatus(JobStatus.PUSHING_OUTPUT)
+        gc.uploadFileToItem(itemId, str(output_path))
+
+
 @app.task(bind=True, acks_late=True, ignore_result=True)
 def convert_video(
     self: Task, folderId: str, itemId: str, user_id: str, user_login: str, skip_transcoding=False

From 2ecf8d911a60a25ab302890b8da08731174853cd Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 26 Jun 2026 16:40:25 -0400
Subject: [PATCH 13/25] Fix web unit tests: lazy-load girderRest in
 importCalibrationFile

The top-level 'platform/web-girder/plugins/girder' import touches window at module
load, which broke the node-environment multicamFileRegistry.spec (ReferenceError:
window is not defined). Import girderRest lazily inside importCalibrationFile so the
module graph stays test-safe.
---
 client/platform/web-girder/multicamFileRegistry.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/platform/web-girder/multicamFileRegistry.ts b/client/platform/web-girder/multicamFileRegistry.ts
index f7806f66f..675f9959b 100644
--- a/client/platform/web-girder/multicamFileRegistry.ts
+++ b/client/platform/web-girder/multicamFileRegistry.ts
@@ -1,7 +1,6 @@
 /** Stash browser File selections for multicam import (paths are not filesystem paths on web). */
 
 import { Location } from '@girder/components/src';
-import girderRest from 'platform/web-girder/plugins/girder';
 import { openFromDisk, GirderUploadManager } from './utils';
 
 const LAST_CALIBRATION_STORAGE_KEY = 'dive_web_last_calibration';
@@ -186,6 +185,9 @@ export async function importCalibrationFile(
   if (!file) {
     throw new Error(`Calibration file "${fileName}" is no longer available; please re-select it.`);
   }
+  // Import the Girder REST client lazily: its module touches `window` at load time,
+  // so a top-level import breaks node-environment unit tests that import this module.
+  const { default: girderRest } = await import('platform/web-girder/plugins/girder');
   const manager = new GirderUploadManager(file, {
     $rest: girderRest,
     parent: { _id: datasetId, _modelType: 'folder' } as Location,

From 6d7186398ce536136e0af1dc9ea96aa2c39476fc Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 12:36:34 -0400
Subject: [PATCH 14/25] remove commented out code, remove the user settings
 reset and use only import Annotations area

---
 .../components/ImportAnnotations.vue            |  9 +++------
 .../components/UserSettingsDialog.vue           |  8 --------
 client/dive-common/components/Viewer.vue        | 17 -----------------
 client/dive-common/store/settings.ts            |  4 ++--
 .../frontend/components/ViewerLoader.vue        |  2 +-
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index 6cf12421a..a3808a06f 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -71,9 +71,6 @@ export default defineComponent({
     const menuOpen = ref(false);
     const additive = ref(false);
     const additivePrepend = ref('');
-    // When importing a new camera file, optionally drop length measurements (and
-    // their length_method locks) computed against the previous calibration.
-    const resetLengths = ref(clientSettings.stereoSettings.clearLengthOnCameraFileLoad);
     const openUpload = async () => {
       try {
         const ret = await openFromDisk('annotation');
@@ -138,7 +135,7 @@ export default defineComponent({
         await api.importCalibrationFile(props.datasetId, ret.filePaths[0]);
         // A new camera file invalidates length measurements from the prior
         // calibration; clear them (and their length_method locks) when checked.
-        if (resetLengths.value) {
+        if (clientSettings.stereoSettings.clearLengthOnCameraFileLoad) {
           const cleared = clearLengthAttributes(cameraStore);
           if (cleared > 0) {
             await save();
@@ -164,7 +161,7 @@ export default defineComponent({
       menuOpen,
       additive,
       additivePrepend,
-      resetLengths,
+      clientSettings,
       sets,
       currentSet,
     };
@@ -327,7 +324,7 @@ export default defineComponent({
               </v-row>
               <v-row>
                 <v-checkbox
-                  v-model="resetLengths"
+                  v-model="clientSettings.stereoSettings.clearLengthOnCameraFileLoad"
                   label="Reset length measurements"
                 />
               </v-row>
diff --git a/client/dive-common/components/UserSettingsDialog.vue b/client/dive-common/components/UserSettingsDialog.vue
index f8f808392..d5c69d7b1 100644
--- a/client/dive-common/components/UserSettingsDialog.vue
+++ b/client/dive-common/components/UserSettingsDialog.vue
@@ -58,14 +58,6 @@ export default defineComponent({
           step="1"
           :disabled="!clientSettings.autoSaveSettings.enabled"
         />
-        <v-switch
-          v-model="clientSettings.stereoSettings.clearLengthOnCameraFileLoad"
-          color="primary"
-          class="my-0 mt-3"
-          label="Clear length attributes on camera-file load"
-          hint="When a new stereo camera/calibration file is loaded, remove stale 'length' measurements from all tracks and detections."
-          persistent-hint
-        />
       </v-card-text>
       <v-card-actions>
         <v-spacer />
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index d190309b0..f6b7f1be5 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -1473,23 +1473,6 @@ export default defineComponent({
           </template>
         </v-select>
 
-        <!-- <v-tooltip v-if="showMultiCamToolbar && multiCamList.length > 1"
-          bottom
-          :z-index="20">
-          <template #activator="{ on }">
-            <v-btn
-              color=""
-              class="calibration-icon mx-1 mode-button"
-              :class="{ 'not-calibrated': true }"
-              small
-              v-on="on"
-            >
-              <v-icon>mdi-checkerboard</v-icon>
-            </v-btn>
-          </template>
-          <span>Cameras calibration</span>
-        </v-tooltip> -->
-
         <v-divider
           vertical
           class="mx-2"
diff --git a/client/dive-common/store/settings.ts b/client/dive-common/store/settings.ts
index 2aa84d908..83dbdd47a 100644
--- a/client/dive-common/store/settings.ts
+++ b/client/dive-common/store/settings.ts
@@ -69,6 +69,8 @@ interface AnnotationSettings {
     delaySeconds: number;
   };
   stereoSettings: {
+    // When importing a new camera file, optionally drop length measurements
+    // computed against the previous calibration.
     clearLengthOnCameraFileLoad: boolean;
     // Recompute length attributes when a line's vertices are modified on a
     // detection that is linked across both cameras.
@@ -155,8 +157,6 @@ const defaultSettings: AnnotationSettings = {
     delaySeconds: 60,
   },
   stereoSettings: {
-    // When a new stereo camera/calibration file is loaded, strip stale
-    // per-track/detection 'length' measurements derived from the old calibration.
     clearLengthOnCameraFileLoad: true,
     updateLengthsOnModify: true,
     autoComputeOtherCamera: false,
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index a84b276bb..7a73f640f 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -1335,7 +1335,7 @@ export default defineComponent({
         </v-tabs>
       </template>
       <template #title-right>
-        <<RunPipelineMenu
+        <RunPipelineMenu
         :selected-dataset-ids="[modifiedId]"
         :sub-type-list="subTypeList"
         :camera-numbers="camNumbers"

From 5eb8f8be3c4dd4079fe9e0fef4bd0d4510bde252 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 12:51:43 -0400
Subject: [PATCH 15/25] resolve desktop import/export button differences

---
 .../desktop/frontend/components/Export.vue    | 42 ++++++++++---------
 .../frontend/components/ViewerLoader.vue      |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/client/platform/desktop/frontend/components/Export.vue b/client/platform/desktop/frontend/components/Export.vue
index 7e5e6aa8e..cfeacdfaf 100644
--- a/client/platform/desktop/frontend/components/Export.vue
+++ b/client/platform/desktop/frontend/components/Export.vue
@@ -20,9 +20,13 @@ export default defineComponent({
       type: String,
       required: true,
     },
-    small: {
-      type: Boolean,
-      default: false,
+    buttonOptions: {
+      type: Object,
+      default: () => ({}),
+    },
+    menuOptions: {
+      type: Object,
+      default: () => ({}),
     },
   },
 
@@ -128,33 +132,31 @@ export default defineComponent({
     v-model="data.menuOpen"
     :close-on-content-click="false"
     :nudge-width="280"
-    offset-y
+    v-bind="menuOptions"
     max-width="280"
   >
     <template #activator="{ on: menuOn }">
       <v-tooltip bottom>
         <template #activator="{ on: tooltipOn }">
           <v-btn
-            outlined
-            depressed
-            color="grey"
-            text
-            class="mx-1"
-            :small="small"
+            class="ma-0"
+            v-bind="buttonOptions"
             v-on="{ ...tooltipOn, ...menuOn }"
           >
-            <v-icon>
-              mdi-export
-            </v-icon>
-            <span
-              v-show="!$vuetify.breakpoint.mdAndDown"
-              class="pl-1"
-            >
-              Export
-            </span>
+            <div>
+              <v-icon>
+                mdi-export
+              </v-icon>
+              <span
+                v-show="!$vuetify.breakpoint.mdAndDown || buttonOptions.block"
+                class="pl-1"
+              >
+                Export
+              </span>
+            </div>
           </v-btn>
         </template>
-        <span>export annotation data</span>
+        <span> Export Annotation Data </span>
       </v-tooltip>
     </template>
     <template>
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index 7a73f640f..d0ecacdb0 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -1359,7 +1359,7 @@ export default defineComponent({
         <Export
           v-if="datasets[id]"
           :id="modifiedId"
-          :button-options="buttonOptions"
+          v-bind="{ buttonOptions, menuOptions }"
         />
       </template>
       <template #right-sidebar="{ sidebarMode }">

From 393e320413aa8fb8bbca5c78e68e782b4b1d4dbd Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 12:59:20 -0400
Subject: [PATCH 16/25] reduce camera selection size

---
 client/dive-common/components/Viewer.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index f6b7f1be5..52806fe5f 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -1461,7 +1461,7 @@ export default defineComponent({
           :items="multiCamList"
           label="Camera"
           class="mx-1 shrink camera-select"
-          style="width: 180px; font-size: 0.9em"
+          :menu-props="{ minWidth: 140 }"
           outlined
           hide-details
           dense
@@ -1886,6 +1886,24 @@ html {
   color: white;
 }
 
+.camera-select {
+  width: 100px;
+  max-width: 100px;
+  flex: 0 0 auto;
+  font-size: 0.9em;
+}
+
+.camera-select .v-select__selections {
+  flex-wrap: nowrap;
+  min-width: 0;
+}
+
+.camera-select .v-select__selection--comma {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .camera-select fieldset {
   height: 33px;
   margin-top: 4px;

From 8493dfa24efd0b26ae0a9169b7ba8de8ce19c2d7 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 13:20:44 -0400
Subject: [PATCH 17/25] button groups compressed text area

---
 .../components/AnnotationVisibilityMenu.vue   | 186 +++++++++++-------
 .../components/CalibrationMenu.vue            |  12 +-
 client/dive-common/components/EditorMenu.vue  | 134 ++++++-------
 .../components/MultiCamToolbar.vue            |  67 +++----
 .../components/OutlinedLabeledGroup.vue       |  43 ++++
 .../components/ToolbarExpandToggle.vue        |  47 +++++
 client/dive-common/components/Viewer.vue      |   4 +-
 .../dive-common/components/toolbarGroup.scss  |  16 ++
 .../frontend/components/ViewerLoader.vue      |  11 +-
 .../web-girder/views/ViewerLoader.vue         |  11 +-
 10 files changed, 330 insertions(+), 201 deletions(-)
 create mode 100644 client/dive-common/components/OutlinedLabeledGroup.vue
 create mode 100644 client/dive-common/components/ToolbarExpandToggle.vue
 create mode 100644 client/dive-common/components/toolbarGroup.scss

diff --git a/client/dive-common/components/AnnotationVisibilityMenu.vue b/client/dive-common/components/AnnotationVisibilityMenu.vue
index 5354fa10b..ea11bc788 100644
--- a/client/dive-common/components/AnnotationVisibilityMenu.vue
+++ b/client/dive-common/components/AnnotationVisibilityMenu.vue
@@ -9,6 +9,9 @@ import {
 
 import { VisibleAnnotationTypes } from 'vue-media-annotator/layers';
 
+import OutlinedLabeledGroup from './OutlinedLabeledGroup.vue';
+import ToolbarExpandToggle from './ToolbarExpandToggle.vue';
+
 interface ButtonData {
   id: string;
   icon: string;
@@ -20,6 +23,10 @@ interface ButtonData {
 
 export default defineComponent({
   name: 'AnnotationVisibilityMenu',
+  components: {
+    OutlinedLabeledGroup,
+    ToolbarExpandToggle,
+  },
   props: {
     visibleModes: {
       type: Array as PropType<(VisibleAnnotationTypes)[]>,
@@ -117,6 +124,14 @@ export default defineComponent({
         },
       ]));
 
+    const primaryViewButtons = computed(
+      () => viewButtons.value.filter((button) => button.id !== 'tooltip'),
+    );
+
+    const advancedVisibilityActive = computed(
+      () => isVisible('tooltip') || isVisible('TrackTail'),
+    );
+
     const updateTailSettings = (type: 'before' | 'after', event: Event) => {
       const value = Number.parseFloat((event.target as HTMLInputElement).value);
       const settings = { ...props.tailSettings, [type]: value };
@@ -131,6 +146,8 @@ export default defineComponent({
       isExpanded,
       layoutKey,
       viewButtons,
+      primaryViewButtons,
+      advancedVisibilityActive,
       isVisible,
       toggleVisible,
       toggleExpanded,
@@ -142,7 +159,7 @@ export default defineComponent({
 </script>
 
 <template>
-  <span class="pb-1">
+  <span class="toolbar-group-host">
     <!-- Dropdown mode when collapsed -->
     <v-menu
       v-if="!isExpanded"
@@ -154,19 +171,15 @@ export default defineComponent({
       <template #activator="{ on, attrs }">
         <v-btn
           v-bind="attrs"
-          class="mx-1 mode-button"
+          class="mx-1 mode-button toolbar-group-activator"
           small
           v-on="on"
         >
           <v-icon>mdi-eye</v-icon>
-          <v-btn
-            icon
-            x-small
-            class="ml-1 expand-toggle"
-            @click.stop="toggleExpanded"
-          >
-            <v-icon small>mdi-chevron-right</v-icon>
-          </v-btn>
+          <toolbar-expand-toggle
+            :expanded="false"
+            @click="toggleExpanded"
+          />
         </v-btn>
       </template>
       <v-list dense>
@@ -254,29 +267,27 @@ export default defineComponent({
     </v-menu>
 
     <!-- Full button mode when expanded -->
-    <span
+    <outlined-labeled-group
       v-else
       :key="`visibility-${layoutKey}`"
-      class="visibility-expanded d-inline-flex align-center flex-wrap"
     >
-      <span class="mr-1 px-3 py-1">
-        <v-icon class="pr-1">
-          mdi-eye
-        </v-icon>
-        <span class="text-subtitle-2">
-          Visibility
+      <template #legend>
+        <span class="d-inline-flex align-center">
+          <v-icon
+            small
+            class="pr-1"
+          >
+            mdi-eye
+          </v-icon>
+          <span>Visibility</span>
+          <toolbar-expand-toggle
+            :expanded="true"
+            @click="toggleExpanded"
+          />
         </span>
-        <v-btn
-          icon
-          x-small
-          class="ml-1 expand-toggle"
-          @click="toggleExpanded"
-        >
-          <v-icon small>mdi-chevron-left</v-icon>
-        </v-btn>
-      </span>
+      </template>
       <template
-        v-for="button in viewButtons"
+        v-for="button in primaryViewButtons"
       >
         <v-menu
           v-if="button.id === 'text'"
@@ -323,59 +334,88 @@ export default defineComponent({
         </v-btn>
       </template>
       <v-menu
-        key="track-tail-settings"
-        open-on-hover
-        bottom
+        key="visibility-advanced"
         offset-y
         :close-on-content-click="false"
+        min-width="280"
       >
-        <template #activator="{ on, attrs }">
-          <v-btn
-            v-bind="attrs"
-            :color="isVisible('TrackTail') ? 'grey darken-2' : ''"
-            class="mx-1 mode-button"
-            small
-            v-on="on"
-            @click="toggleVisible('TrackTail')"
-          >
-            <v-icon>mdi-navigation</v-icon>
-          </v-btn>
+        <template #activator="{ on: menuOn, attrs: menuAttrs }">
+          <v-tooltip bottom>
+            <template #activator="{ on: tooltipOn, attrs: tooltipAttrs }">
+              <v-btn
+                v-bind="{ ...menuAttrs, ...tooltipAttrs }"
+                :color="advancedVisibilityActive ? 'grey darken-2' : ''"
+                class="mx-1 mode-button"
+                small
+                v-on="{ ...menuOn, ...tooltipOn }"
+              >
+                <v-icon>mdi-tune</v-icon>
+              </v-btn>
+            </template>
+            <span>Advanced settings</span>
+          </v-tooltip>
         </template>
         <v-card
-          class="pa-4 flex-column d-flex"
+          class="pa-3 flex-column d-flex"
           outlined
         >
-          <label for="frames-before-full">Frames before: {{ tailSettings.before }}</label>
-          <input
-            id="frames-before-full"
-            type="range"
-            name="frames-before-full"
-            class="tail-slider-width"
-            label
-            min="0"
-            max="100"
-            :value="tailSettings.before"
-            @input="updateTailSettings('before', $event)"
-          >
-          <div class="py-2" />
-          <label for="frames-after-full">Frames after: {{ tailSettings.after }}</label>
-          <input
-            id="frames-after-full"
-            type="range"
-            name="frames-after-full"
-            class="tail-slider-width"
-            min="0"
-            max="100"
-            :value="tailSettings.after"
-            @input="updateTailSettings('after', $event)"
-          >
+          <div class="d-flex align-center advanced-menu-row">
+            <v-btn
+              :color="isVisible('tooltip') ? 'grey darken-2' : ''"
+              class="mode-button"
+              small
+              @click="toggleVisible('tooltip')"
+            >
+              <v-icon>mdi-tooltip-text-outline</v-icon>
+            </v-btn>
+            <span class="ml-2">Tooltip</span>
+          </div>
+          <div class="d-flex align-center advanced-menu-row">
+            <v-btn
+              :color="isVisible('TrackTail') ? 'grey darken-2' : ''"
+              class="mode-button"
+              small
+              @click="toggleVisible('TrackTail')"
+            >
+              <v-icon>mdi-navigation</v-icon>
+            </v-btn>
+            <span class="ml-2">Track Trails</span>
+          </div>
+          <template v-if="isVisible('TrackTail')">
+            <v-divider class="my-2" />
+            <label for="frames-before-full">Frames before: {{ tailSettings.before }}</label>
+            <input
+              id="frames-before-full"
+              type="range"
+              name="frames-before-full"
+              class="tail-slider-width"
+              min="0"
+              max="100"
+              :value="tailSettings.before"
+              @input="updateTailSettings('before', $event)"
+            >
+            <div class="py-2" />
+            <label for="frames-after-full">Frames after: {{ tailSettings.after }}</label>
+            <input
+              id="frames-after-full"
+              type="range"
+              name="frames-after-full"
+              class="tail-slider-width"
+              min="0"
+              max="100"
+              :value="tailSettings.after"
+              @input="updateTailSettings('after', $event)"
+            >
+          </template>
         </v-card>
       </v-menu>
-    </span>
+    </outlined-labeled-group>
   </span>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
+@import './toolbarGroup.scss';
+
 .mode-button {
   border: 1px solid grey;
   min-width: 36px;
@@ -383,11 +423,7 @@ export default defineComponent({
 .tail-slider-width {
   width: 240px;
 }
-.expand-toggle {
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-.expand-toggle:hover {
-  opacity: 1;
+.advanced-menu-row + .advanced-menu-row {
+  margin-top: 8px;
 }
 </style>
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index a9d8b8be6..67a87b6d1 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -20,7 +20,6 @@ export default defineComponent({
   },
   props: {
     datasetId: { type: String, required: true },
-    buttonOptions: { type: Object, default: () => ({}) },
   },
   setup(props) {
     const showCalibrationDialog = ref(false);
@@ -68,20 +67,19 @@ export default defineComponent({
 </script>
 
 <template>
-  <div>
+  <div class="calibration-menu-inline">
     <v-tooltip
       bottom
       :z-index="20"
     >
       <template #activator="{ on }">
-        <v-btn
-          class="ma-0"
-          v-bind="buttonOptions"
+        <v-icon
+          class="mx-1"
           v-on="on"
           @click="showCalibrationDialog = true"
         >
-          <v-icon>mdi-checkerboard</v-icon>
-        </v-btn>
+          mdi-checkerboard
+        </v-icon>
       </template>
       <span>
         Cameras calibration
diff --git a/client/dive-common/components/EditorMenu.vue b/client/dive-common/components/EditorMenu.vue
index 740c38409..51f806e52 100644
--- a/client/dive-common/components/EditorMenu.vue
+++ b/client/dive-common/components/EditorMenu.vue
@@ -14,6 +14,8 @@ import Recipe from 'vue-media-annotator/recipe';
 import SegmentationPointClick from 'dive-common/recipes/segmentationpointclick';
 
 import AnnotationVisibilityMenu from './AnnotationVisibilityMenu.vue';
+import OutlinedLabeledGroup from './OutlinedLabeledGroup.vue';
+import ToolbarExpandToggle from './ToolbarExpandToggle.vue';
 
 interface ButtonData {
   id: string;
@@ -30,6 +32,8 @@ export default defineComponent({
   name: 'EditorMenu',
   components: {
     AnnotationVisibilityMenu,
+    OutlinedLabeledGroup,
+    ToolbarExpandToggle,
   },
   props: {
     editingTrack: {
@@ -306,38 +310,32 @@ export default defineComponent({
         </div>
       </div>
       <!-- Collapsed mode for edit buttons -->
-      <v-menu
-        v-if="!isEditButtonsExpanded"
-        :key="editButtonsMenuKey"
-        offset-y
-        :close-on-content-click="false"
-      >
-        <template #activator="{ on, attrs }">
-          <v-btn
-            v-bind="attrs"
-            :disabled="!editingMode || activeEditButton?.loading"
-            :outlined="!activeEditButton?.active"
-            :color="activeEditButton?.active ? editingHeader.color : ''"
-            class="mx-1"
-            small
-            v-on="on"
-          >
-            <pre v-if="activeEditButton?.mousetrap">{{ activeEditButton.mousetrap[0].bind }}:</pre>
-            <v-icon :class="{ 'mdi-spin': activeEditButton?.loading }">
-              {{ activeEditButton?.icon }}
-            </v-icon>
+      <span class="toolbar-group-host">
+        <v-menu
+          v-if="!isEditButtonsExpanded"
+          :key="editButtonsMenuKey"
+          offset-y
+          :close-on-content-click="false"
+        >
+          <template #activator="{ on, attrs }">
             <v-btn
-              icon
-              x-small
-              class="ml-1 expand-toggle"
-              @click.stop="toggleEditButtonsExpanded"
+              v-bind="attrs"
+              :disabled="!editingMode || activeEditButton?.loading"
+              :color="activeEditButton?.active ? editingHeader.color : ''"
+              class="mx-1 mode-button toolbar-group-activator"
+              small
+              v-on="on"
             >
-              <v-icon small>
-                mdi-chevron-right
+              <pre v-if="activeEditButton?.mousetrap">{{ activeEditButton.mousetrap[0].bind }}:</pre>
+              <v-icon :class="{ 'mdi-spin': activeEditButton?.loading }">
+                {{ activeEditButton?.icon }}
               </v-icon>
+              <toolbar-expand-toggle
+                :expanded="false"
+                @click="toggleEditButtonsExpanded"
+              />
             </v-btn>
-          </v-btn>
-        </template>
+          </template>
         <v-list dense>
           <v-list-item
             v-for="button in editButtons"
@@ -363,42 +361,42 @@ export default defineComponent({
             </v-list-item-content>
           </v-list-item>
         </v-list>
-      </v-menu>
+        </v-menu>
 
-      <!-- Expanded mode for edit buttons -->
-      <template v-else>
-        <span class="mr-1 px-3 py-1">
-          <v-icon class="pr-1">
-            mdi-pencil
-          </v-icon>
-          <span class="text-subtitle-2">
-            Edit Types
-          </span>
+        <!-- Expanded mode for edit buttons -->
+        <outlined-labeled-group v-else>
+          <template #legend>
+            <span class="d-inline-flex align-center">
+              <v-icon
+                small
+                class="pr-1"
+              >
+                mdi-pencil
+              </v-icon>
+              <span>Edit Types</span>
+              <toolbar-expand-toggle
+                :expanded="true"
+                @click="toggleEditButtonsExpanded"
+              />
+            </span>
+          </template>
           <v-btn
-            icon
-            x-small
-            class="ml-1 expand-toggle"
-            @click="toggleEditButtonsExpanded"
+            v-for="button in editButtons"
+            :key="button.id + 'view'"
+            :disabled="!editingMode || button.loading"
+            :outlined="!button.active"
+            :color="button.active ? editingHeader.color : ''"
+            class="mx-1"
+            small
+            @click="button.click"
           >
-            <v-icon small>mdi-chevron-left</v-icon>
+            <pre v-if="button.mousetrap">{{ button.mousetrap[0].bind }}:</pre>
+            <v-icon :class="{ 'mdi-spin': button.loading }">
+              {{ button.icon }}
+            </v-icon>
           </v-btn>
-        </span>
-        <v-btn
-          v-for="button in editButtons"
-          :key="button.id + 'view'"
-          :disabled="!editingMode || button.loading"
-          :outlined="!button.active"
-          :color="button.active ? editingHeader.color : ''"
-          class="mx-1"
-          small
-          @click="button.click"
-        >
-          <pre v-if="button.mousetrap">{{ button.mousetrap[0].bind }}:</pre>
-          <v-icon :class="{ 'mdi-spin': button.loading }">
-            {{ button.icon }}
-          </v-icon>
-        </v-btn>
-      </template>
+        </outlined-labeled-group>
+      </span>
       <!-- Segmentation Reset button -->
       <template v-if="activeSegmentationRecipe && editingMode === 'Point'">
         <v-divider
@@ -439,25 +437,17 @@ export default defineComponent({
   </v-row>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
+@import './toolbarGroup.scss';
+
 .modechip {
   border-radius: 16px;
   white-space: nowrap;
   border: 1px solid;
   cursor: default;
 }
-.mode-group {
-  border: 1px solid grey;
-  border-radius: 4px;
-}
 .mode-button{
   border: 1px solid grey;
-}
-.expand-toggle {
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-.expand-toggle:hover {
-  opacity: 1;
+  min-width: 36px;
 }
 </style>
diff --git a/client/dive-common/components/MultiCamToolbar.vue b/client/dive-common/components/MultiCamToolbar.vue
index c89225e82..670c70e28 100644
--- a/client/dive-common/components/MultiCamToolbar.vue
+++ b/client/dive-common/components/MultiCamToolbar.vue
@@ -17,6 +17,9 @@ import {
 import { AnnotationId } from 'vue-media-annotator/BaseAnnotation';
 import { Mousetrap } from 'vue-media-annotator/types';
 
+import OutlinedLabeledGroup from './OutlinedLabeledGroup.vue';
+import ToolbarExpandToggle from './ToolbarExpandToggle.vue';
+
 interface ToolbarButton {
   id: string;
   icon: string;
@@ -29,6 +32,10 @@ interface ToolbarButton {
 
 export default defineComponent({
   name: 'MultiCamToolbar',
+  components: {
+    OutlinedLabeledGroup,
+    ToolbarExpandToggle,
+  },
   setup() {
     const selectedCamera = useSelectedCamera();
     const selectedTrackId = useSelectedTrackId();
@@ -298,7 +305,7 @@ export default defineComponent({
   <span
     v-if="selectedTrackId !== null && cameras.length > 1"
     v-mousetrap="mousetrap"
-    class="pb-1"
+    class="toolbar-group-host"
   >
     <!-- Dropdown mode when collapsed -->
     <v-menu
@@ -310,19 +317,15 @@ export default defineComponent({
       <template #activator="{ on, attrs }">
         <v-btn
           v-bind="attrs"
-          class="mx-1 mode-button"
+          class="mx-1 mode-button toolbar-group-activator"
           small
           v-on="on"
         >
           <v-icon>mdi-image-multiple</v-icon>
-          <v-btn
-            icon
-            x-small
-            class="ml-1 expand-toggle"
-            @click.stop="toggleExpanded"
-          >
-            <v-icon small>mdi-chevron-right</v-icon>
-          </v-btn>
+          <toolbar-expand-toggle
+            :expanded="false"
+            @click="toggleExpanded"
+          />
         </v-btn>
       </template>
       <v-list dense>
@@ -376,23 +379,22 @@ export default defineComponent({
     </v-menu>
 
     <!-- Full button mode when expanded -->
-    <template v-else>
-      <span class="mr-1 px-3 py-1">
-        <v-icon class="pr-1">
-          mdi-image-multiple
-        </v-icon>
-        <span class="text-subtitle-2">
-          Multi-Cam Tools
+    <outlined-labeled-group v-else>
+      <template #legend>
+        <span class="d-inline-flex align-center">
+          <v-icon
+            small
+            class="pr-1"
+          >
+            mdi-image-multiple
+          </v-icon>
+          <span>Multi-Cam Tools</span>
+          <toolbar-expand-toggle
+            :expanded="true"
+            @click="toggleExpanded"
+          />
         </span>
-        <v-btn
-          icon
-          x-small
-          class="ml-1 mr-0 mr-0 expand-toggle"
-          @click="toggleExpanded"
-        >
-          <v-icon small class="mr-0">mdi-chevron-left</v-icon>
-        </v-btn>
-      </span>
+      </template>
       <!-- Edit/Add detection on opposite camera -->
       <v-tooltip bottom>
         <template #activator="{ on }">
@@ -509,11 +511,13 @@ export default defineComponent({
         </template>
         <span>Delete track from current camera</span>
       </v-tooltip>
-    </template>
+    </outlined-labeled-group>
   </span>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
+@import './toolbarGroup.scss';
+
 .multicam-toolbar {
   flex-shrink: 0;
 }
@@ -521,11 +525,4 @@ export default defineComponent({
   border: 1px solid grey;
   min-width: 36px;
 }
-.expand-toggle {
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-.expand-toggle:hover {
-  opacity: 1;
-}
 </style>
diff --git a/client/dive-common/components/OutlinedLabeledGroup.vue b/client/dive-common/components/OutlinedLabeledGroup.vue
new file mode 100644
index 000000000..38aa6c292
--- /dev/null
+++ b/client/dive-common/components/OutlinedLabeledGroup.vue
@@ -0,0 +1,43 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'OutlinedLabeledGroup',
+});
+</script>
+
+<template>
+  <fieldset class="outlined-labeled-group">
+    <legend class="outlined-labeled-group__legend">
+      <slot name="legend" />
+    </legend>
+    <div class="outlined-labeled-group__content">
+      <slot />
+    </div>
+  </fieldset>
+</template>
+
+<style scoped lang="scss">
+.outlined-labeled-group {
+  border: 1px solid rgba(255, 255, 255, 0.24);
+  border-radius: 4px;
+  margin: -9px 4px 0;
+  padding: 2px 6px 4px;
+  min-inline-size: min-content;
+}
+
+.outlined-labeled-group__legend {
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 12px;
+  line-height: 1.25;
+  padding: 0 4px;
+  width: auto;
+}
+
+.outlined-labeled-group__content {
+  display: inline-flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0;
+}
+</style>
diff --git a/client/dive-common/components/ToolbarExpandToggle.vue b/client/dive-common/components/ToolbarExpandToggle.vue
new file mode 100644
index 000000000..cf394dbbc
--- /dev/null
+++ b/client/dive-common/components/ToolbarExpandToggle.vue
@@ -0,0 +1,47 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'ToolbarExpandToggle',
+  props: {
+    expanded: {
+      type: Boolean,
+      required: true,
+    },
+  },
+});
+</script>
+
+<template>
+  <v-tooltip
+    bottom
+    :open-delay="200"
+  >
+    <template #activator="{ on: tooltipOn, attrs: tooltipAttrs }">
+      <v-btn
+        icon
+        x-small
+        class="expand-toggle ml-1"
+        v-bind="tooltipAttrs"
+        v-on="tooltipOn"
+        @click.stop="$emit('click', $event)"
+      >
+        <v-icon small>
+          {{ expanded ? 'mdi-chevron-left' : 'mdi-chevron-right' }}
+        </v-icon>
+      </v-btn>
+    </template>
+    <span>{{ expanded ? 'Collapse' : 'Expand' }}</span>
+  </v-tooltip>
+</template>
+
+<style scoped>
+.expand-toggle {
+  opacity: 0.5;
+  transition: opacity 0.15s, background-color 0.15s;
+}
+.expand-toggle:hover {
+  opacity: 1;
+  background-color: rgba(255, 255, 255, 0.12) !important;
+}
+</style>
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 52806fe5f..df9ded714 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -1473,6 +1473,8 @@ export default defineComponent({
           </template>
         </v-select>
 
+        <slot name="extension-right" />
+
         <v-divider
           vertical
           class="mx-2"
@@ -1491,8 +1493,6 @@ export default defineComponent({
           </template>
           <span>Menus for Advanced Tools/Settings</span>
         </v-tooltip>
-
-        <slot name="extension-right" />
       </template>
 
       <slot name="title-right" />
diff --git a/client/dive-common/components/toolbarGroup.scss b/client/dive-common/components/toolbarGroup.scss
new file mode 100644
index 000000000..8a49117fb
--- /dev/null
+++ b/client/dive-common/components/toolbarGroup.scss
@@ -0,0 +1,16 @@
+.toolbar-group-host {
+  display: inline-flex;
+  align-items: center;
+  vertical-align: middle;
+  margin-top: -9px;
+}
+
+.toolbar-group-activator.v-btn.v-size--small {
+  height: 28px !important;
+  min-height: 28px !important;
+}
+
+.toolbar-group-activator.mode-button {
+  border: 1px solid grey;
+  min-width: 36px;
+}
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index d0ecacdb0..5e3d0f9b4 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -1344,11 +1344,6 @@ export default defineComponent({
         :time-filter="timeFilter"
         v-bind="{ buttonOptions, menuOptions }"
         />
-        <CalibrationMenu
-          v-if="subTypeList[0] === 'stereo'"
-          :dataset-id="modifiedId"
-          :button-options="buttonOptions"
-        />
         <ImportAnnotations
           :dataset-id="modifiedId"
           :sub-type="subTypeList[0]"
@@ -1362,6 +1357,12 @@ export default defineComponent({
           v-bind="{ buttonOptions, menuOptions }"
         />
       </template>
+      <template #extension-right>
+        <CalibrationMenu
+          v-if="subTypeList[0] === 'stereo'"
+          :dataset-id="modifiedId"
+        />
+      </template>
       <template #right-sidebar="{ sidebarMode }">
         <SidebarContext :sidebar-mode="sidebarMode">
           <template #default="{ name, subCategory }">
diff --git a/client/platform/web-girder/views/ViewerLoader.vue b/client/platform/web-girder/views/ViewerLoader.vue
index 60ed2ae54..04e1ec3d9 100644
--- a/client/platform/web-girder/views/ViewerLoader.vue
+++ b/client/platform/web-girder/views/ViewerLoader.vue
@@ -306,11 +306,6 @@ export default defineComponent({
         :time-filter="timeFilter"
         :exclude-pipeline-terms="webExcludedPipelineTerms"
       />
-      <CalibrationMenu
-        v-if="subTypeList[0] === 'stereo'"
-        :dataset-id="id"
-        :button-options="buttonOptions"
-      />
       <ImportAnnotations
         :button-options="buttonOptions"
         :menu-options="menuOptions"
@@ -330,6 +325,12 @@ export default defineComponent({
         :revision="revisionNum"
       />
     </template>
+    <template #extension-right>
+      <CalibrationMenu
+        v-if="subTypeList[0] === 'stereo'"
+        :dataset-id="id"
+      />
+    </template>
     <template #right-sidebar="{ sidebarMode }">
       <SidebarContext :sidebar-mode="sidebarMode">
         <template #default="{ name, subCategory }">

From 83b70d11c955ce1d219420fd3da0d400320ac834 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 14:11:55 -0400
Subject: [PATCH 18/25] disable state for calibration icon when none exists

---
 .../components/CalibrationMenu.vue            | 48 ++++++++++++++++---
 .../components/ImportAnnotations.vue          |  7 +--
 .../frontend/components/ViewerLoader.vue      | 24 ++++++++++
 .../annotators/useMediaController.ts          | 33 +++++++++++++
 4 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index 67a87b6d1..20cc7863b 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -2,6 +2,7 @@
 import {
   computed,
   defineComponent,
+  PropType,
   ref,
   watch,
 } from 'vue';
@@ -20,6 +21,10 @@ export default defineComponent({
   },
   props: {
     datasetId: { type: String, required: true },
+    calibrationFile: {
+      type: String as PropType<string | null>,
+      default: null,
+    },
   },
   setup(props) {
     const showCalibrationDialog = ref(false);
@@ -38,11 +43,20 @@ export default defineComponent({
     // when the dataset changes.
     watch(() => showCalibrationDialog.value, (open) => { if (open) refresh(); });
     watch(() => props.datasetId, () => refresh());
+    watch(() => props.calibrationFile, () => refresh());
+
+    const hasCalibration = computed(() => !!calibrationResult.value);
 
     const calibrationFileName = computed(
       () => calibrationResult.value?.originalName ?? calibrationResult.value?.path,
     );
 
+    const openCalibrationDialog = () => {
+      if (hasCalibration.value) {
+        showCalibrationDialog.value = true;
+      }
+    };
+
     const onDownload = () => {
       downloadCalibration?.(props.datasetId);
     };
@@ -56,7 +70,9 @@ export default defineComponent({
     return {
       showCalibrationDialog,
       calibrationResult,
+      hasCalibration,
       calibrationFileName,
+      openCalibrationDialog,
       canDownload: !!downloadCalibration,
       canDelete: !!deleteCalibration,
       onDownload,
@@ -73,21 +89,29 @@ export default defineComponent({
       :z-index="20"
     >
       <template #activator="{ on }">
-        <v-icon
-          class="mx-1"
+        <span
+          class="calibration-menu-inline__activator"
           v-on="on"
-          @click="showCalibrationDialog = true"
         >
-          mdi-checkerboard
-        </v-icon>
+          <v-icon
+            class="mx-1"
+            :class="{ 'calibration-menu-icon--disabled': !hasCalibration }"
+            @click="openCalibrationDialog"
+          >
+            mdi-checkerboard
+          </v-icon>
+        </span>
       </template>
-      <span>
+      <span v-if="hasCalibration">
         Cameras calibration
         <template v-if="calibrationFileName">
           <br>
           {{ calibrationFileName }}
         </template>
       </span>
+      <span v-else>
+        No calibration file loaded. Use the Import button to import a calibration file.
+      </span>
     </v-tooltip>
 
     <CalibrationDialog
@@ -101,3 +125,15 @@ export default defineComponent({
     />
   </div>
 </template>
+
+<style scoped lang="scss">
+.calibration-menu-inline__activator {
+  display: inline-flex;
+  align-items: center;
+}
+
+.calibration-menu-icon--disabled {
+  opacity: 0.38;
+  cursor: default;
+}
+</style>
diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index a3808a06f..5d5869a34 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -44,7 +44,8 @@ export default defineComponent({
       default: false,
     },
   },
-  setup(props) {
+  emits: ['calibration-imported'],
+  setup(props, { emit }) {
     const api = useApi();
     const { openFromDisk, importAnnotationFile } = api;
     const { reloadAnnotations, save } = useHandler();
@@ -132,7 +133,7 @@ export default defineComponent({
         if (ret.canceled || !ret.filePaths.length) return;
         menuOpen.value = false;
         processing.value = true;
-        await api.importCalibrationFile(props.datasetId, ret.filePaths[0]);
+        const result = await api.importCalibrationFile(props.datasetId, ret.filePaths[0]);
         // A new camera file invalidates length measurements from the prior
         // calibration; clear them (and their length_method locks) when checked.
         if (clientSettings.stereoSettings.clearLengthOnCameraFileLoad) {
@@ -142,7 +143,7 @@ export default defineComponent({
           }
         }
         processing.value = false;
-        await reloadAnnotations();
+        emit('calibration-imported', result.calibration);
       } catch (error) {
         processing.value = false;
         prompt({
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index 5e3d0f9b4..2cd27d2ba 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -1272,6 +1272,27 @@ export default defineComponent({
       });
     }
 
+    function onCalibrationImported(calibrationPath: string) {
+      const dataset = datasets.value[props.id];
+      if (dataset) {
+        dataset.calibration = calibrationPath;
+      }
+      stereoCalibrationFile = calibrationPath;
+      if (!stereoServiceWanted()) return;
+      void (async () => {
+        try {
+          const hasStereo = await loadStereoMetadata();
+          if (!hasStereo) return;
+          const result = await stereoEnable(undefined, stereoCalibrationFile);
+          if (!result.success) return;
+          stereoEnabled.value = true;
+          await ensureStereoFrame(getViewerFrame());
+        } catch (err) {
+          console.warn('[Stereo] Failed to apply calibration after import:', err);
+        }
+      })();
+    }
+
     return {
       datasets,
       viewerRef,
@@ -1297,6 +1318,7 @@ export default defineComponent({
       handleStereoAnnotationReset,
       handleStereoSegmentationFinalize,
       handleStereoTrackLinked,
+      onCalibrationImported,
     };
   },
 });
@@ -1350,6 +1372,7 @@ export default defineComponent({
           :calibration-file="datasets[id] && datasets[id].calibration"
           v-bind="{ buttonOptions, menuOptions, readOnlyMode }"
           block-on-unsaved
+          @calibration-imported="onCalibrationImported"
         />
         <Export
           v-if="datasets[id]"
@@ -1361,6 +1384,7 @@ export default defineComponent({
         <CalibrationMenu
           v-if="subTypeList[0] === 'stereo'"
           :dataset-id="modifiedId"
+          :calibration-file="datasets[id] && datasets[id].calibration"
         />
       </template>
       <template #right-sidebar="{ sidebarMode }">
diff --git a/client/src/components/annotators/useMediaController.ts b/client/src/components/annotators/useMediaController.ts
index 4a6b68b34..2908ed45b 100644
--- a/client/src/components/annotators/useMediaController.ts
+++ b/client/src/components/annotators/useMediaController.ts
@@ -85,6 +85,34 @@ export function useMediaController() {
   let cameraControllerSymbols: Record<string, symbol> = {};
   const synchronizeCameras: Ref<boolean> = ref(false);
   const resizeTrigger: Ref<number> = ref(0);
+  const emptyControllerFrame = ref(0);
+  const emptyControllerMaxFrame = ref(0);
+  const emptyControllerPlaying = ref(false);
+  const emptyControllerSpeed = ref(1);
+  const emptyControllerVolume = ref(0);
+  const emptyControllerCurrentTime = ref(0);
+  const emptyControllerCameras = computed(() => [] as string[]);
+  const emptyAggregateController: AggregateMediaController = {
+    cameras: emptyControllerCameras,
+    maxFrame: emptyControllerMaxFrame,
+    frame: emptyControllerFrame,
+    seek: () => {},
+    nextFrame: () => {},
+    prevFrame: () => {},
+    volume: emptyControllerVolume,
+    setVolume: () => {},
+    speed: emptyControllerSpeed,
+    setSpeed: () => {},
+    pause: () => {},
+    play: () => {},
+    playing: emptyControllerPlaying,
+    resetZoom: () => {},
+    currentTime: emptyControllerCurrentTime,
+    getController,
+    toggleSynchronizeCameras,
+    cameraSync: synchronizeCameras,
+    resizeTrigger,
+  };
   function clear() {
     geoViewers = {};
     containers = {};
@@ -471,6 +499,11 @@ export function useMediaController() {
   }
 
   const aggregateController: Ref<AggregateMediaController> = computed(() => {
+    if (cameras.value.length === 0) {
+      // During reload the controllers are cleared before new ones are created.
+      // Return a stub so watchers (e.g. LayerManager resizeTrigger) do not throw.
+      return emptyAggregateController;
+    }
     const defaultController = getController();
     return {
       cameras: computed(() => cameras.value.map((v) => String(v))),

From 850c29be4badc6a812adc527527d5a21262bf47b Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 14:16:39 -0400
Subject: [PATCH 19/25] utilize last calibration file in desktop if no
 calibration file found

---
 .../components/ImportAnnotations.vue          |  74 +++++++++++-
 .../ImportMultiCamCalibration.vue             | 108 +++++++++++++-----
 .../useImportMultiCamDialog.ts                |  34 +++++-
 3 files changed, 182 insertions(+), 34 deletions(-)

diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index 5d5869a34..46296d170 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import {
-  computed, defineComponent, ref, PropType,
+  computed, defineComponent, ref, PropType, onMounted,
 } from 'vue';
 import { useApi } from 'dive-common/apispec';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
@@ -48,6 +48,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const api = useApi();
     const { openFromDisk, importAnnotationFile } = api;
+    const lastCalibrationPath = ref('');
     const { reloadAnnotations, save } = useHandler();
     const cameraStore = useCameraStore();
     // Camera/calibration file import is desktop-only (needs importCalibrationFile)
@@ -59,6 +60,22 @@ export default defineComponent({
       if (!props.calibrationFile) return '';
       return props.calibrationFile.replace(/^.*[\\/]/, '');
     });
+    const showLastCalibrationSuggestion = computed(
+      () => cameraFileSupported.value
+        && !props.calibrationFile
+        && !!lastCalibrationPath.value,
+    );
+    const lastCalibrationFileName = computed(
+      () => lastCalibrationPath.value.replace(/^.*[\\/]/, ''),
+    );
+    onMounted(async () => {
+      if (api.getLastCalibration) {
+        const lastCalibration = await api.getLastCalibration();
+        if (lastCalibration) {
+          lastCalibrationPath.value = lastCalibration;
+        }
+      }
+    });
     const sets = computed(() => {
       const data = useAnnotationSets();
       const temp = cloneDeep(data.value);
@@ -153,9 +170,38 @@ export default defineComponent({
         });
       }
     };
+    const applyLastCalibration = async () => {
+      if (!api.importCalibrationFile || !lastCalibrationPath.value) return;
+      try {
+        menuOpen.value = false;
+        processing.value = true;
+        const result = await api.importCalibrationFile(
+          props.datasetId,
+          lastCalibrationPath.value,
+        );
+        if (clientSettings.stereoSettings.clearLengthOnCameraFileLoad) {
+          const cleared = clearLengthAttributes(cameraStore);
+          if (cleared > 0) {
+            await save();
+          }
+        }
+        processing.value = false;
+        emit('calibration-imported', result.calibration);
+      } catch (error) {
+        processing.value = false;
+        prompt({
+          title: 'Camera File Import Failed',
+          text: [getResponseError(error)],
+          positiveButton: 'OK',
+        });
+      }
+    };
     return {
       openUpload,
       openCalibrationUpload,
+      applyLastCalibration,
+      showLastCalibrationSuggestion,
+      lastCalibrationFileName,
       cameraFileSupported,
       currentCalibrationName,
       processing,
@@ -298,7 +344,18 @@ export default defineComponent({
             Import Camera File
           </v-card-title>
           <v-card-text class="pb-0">
-            <div v-if="currentCalibrationName">
+            <v-alert
+              v-if="showLastCalibrationSuggestion"
+              type="info"
+              outlined
+              dense
+              class="mb-3"
+            >
+              No camera file loaded. Use your last calibration file
+              <strong v-if="lastCalibrationFileName">({{ lastCalibrationFileName }})</strong>
+              or choose a different one.
+            </v-alert>
+            <div v-else-if="currentCalibrationName">
               A camera file is loaded.
             </div>
             <div
@@ -314,13 +371,24 @@ export default defineComponent({
           <v-container>
             <v-col>
               <v-row>
+                <v-btn
+                  v-if="showLastCalibrationSuggestion"
+                  depressed
+                  block
+                  color="primary"
+                  class="mb-2"
+                  :disabled="!datasetId || processing"
+                  @click="applyLastCalibration"
+                >
+                  Use last calibration
+                </v-btn>
                 <v-btn
                   depressed
                   block
                   :disabled="!datasetId || processing"
                   @click="openCalibrationUpload"
                 >
-                  Import
+                  {{ showLastCalibrationSuggestion ? 'Choose calibration' : 'Import' }}
                 </v-btn>
               </v-row>
               <v-row>
diff --git a/client/dive-common/components/ImportMultiCamDialog/ImportMultiCamCalibration.vue b/client/dive-common/components/ImportMultiCamDialog/ImportMultiCamCalibration.vue
index a5224b0b1..856470031 100644
--- a/client/dive-common/components/ImportMultiCamDialog/ImportMultiCamCalibration.vue
+++ b/client/dive-common/components/ImportMultiCamDialog/ImportMultiCamCalibration.vue
@@ -11,48 +11,96 @@ export default defineComponent({
     ...importMultiCamContextProp,
   },
   setup(props) {
-    const { calibrationFile, open, clearCalibration } = props.ctx;
+    const {
+      calibrationFile,
+      lastCalibrationFileName,
+      calibrationAutoDiscoveryFailed,
+      showLastCalibrationSuggestion,
+      open,
+      clearCalibration,
+      applyLastCalibration,
+    } = props.ctx;
     return {
       calibrationFile,
+      lastCalibrationFileName,
+      calibrationAutoDiscoveryFailed,
+      showLastCalibrationSuggestion,
       open,
       clearCalibration,
+      applyLastCalibration,
     };
   },
 });
 </script>
 
 <template>
-  <v-row
-    no-gutters
-    class="align-center my-3"
-  >
-    <v-text-field
-      label="Calibration File"
-      placeholder="Not selected"
-      readonly
+  <div>
+    <v-alert
+      v-if="showLastCalibrationSuggestion"
+      type="info"
       outlined
       dense
-      hide-details
-      :value="calibrationFile"
-      class="mr-3"
-    />
-    <v-btn
-      v-if="calibrationFile"
-      icon
-      class="mr-2"
-      aria-label="Clear calibration file"
-      @click="clearCalibration"
+      class="mb-3"
     >
-      <v-icon>mdi-close</v-icon>
-    </v-btn>
-    <v-btn
-      color="primary"
-      @click="open('calibration', 'calibration')"
+      <template v-if="calibrationAutoDiscoveryFailed">
+        No calibration file was found in the parent folder.
+      </template>
+      <template v-else>
+        No calibration file selected.
+      </template>
+      You can use your last calibration file
+      <strong v-if="lastCalibrationFileName">({{ lastCalibrationFileName }})</strong>
+      or choose a different one.
+      <div class="mt-2">
+        <v-btn
+          small
+          color="primary"
+          class="mr-2"
+          @click="applyLastCalibration"
+        >
+          Use last calibration
+        </v-btn>
+        <v-btn
+          small
+          outlined
+          @click="open('calibration', 'calibration')"
+        >
+          Choose calibration
+        </v-btn>
+      </div>
+    </v-alert>
+    <v-row
+      no-gutters
+      class="align-center my-3"
     >
-      Choose calibration
-      <v-icon class="ml-2">
-        mdi-matrix
-      </v-icon>
-    </v-btn>
-  </v-row>
+      <v-text-field
+        label="Calibration File"
+        placeholder="Not selected"
+        readonly
+        outlined
+        dense
+        hide-details
+        :value="calibrationFile"
+        class="mr-3"
+      />
+      <v-btn
+        v-if="calibrationFile"
+        icon
+        class="mr-2"
+        aria-label="Clear calibration file"
+        @click="clearCalibration"
+      >
+        <v-icon>mdi-close</v-icon>
+      </v-btn>
+      <v-btn
+        color="primary"
+        @click="open('calibration', 'calibration')"
+      >
+        Choose calibration
+        <v-icon class="ml-2">
+          mdi-matrix
+        </v-icon>
+      </v-btn>
+    </v-row>
+  </div>
 </template>
diff --git a/client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts b/client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts
index 6ae083c3a..df5478d47 100644
--- a/client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts
+++ b/client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts
@@ -67,6 +67,8 @@ export function useImportMultiCamDialog(
   const pendingImportPayloads: Ref<Record<string, MediaImportResponse | null>> = ref({});
   const globList: Ref<Record<string, { glob: string; trackFile: string }>> = ref({});
   const calibrationFile = ref('');
+  const lastCalibrationPath = ref('');
+  const calibrationAutoDiscoveryFailed = ref(false);
   const datasetName = ref('');
   const subfolderOriginalNames: Ref<Record<string, string>> = ref({});
   const cameraOrder: Ref<string[]> = ref([]);
@@ -78,11 +80,24 @@ export function useImportMultiCamDialog(
     if (props.stereo && getLastCalibration) {
       const lastCalibration = await getLastCalibration();
       if (lastCalibration) {
-        calibrationFile.value = lastCalibration;
+        lastCalibrationPath.value = lastCalibration;
       }
     }
   });
 
+  const lastCalibrationFileName = computed(() => {
+    if (!lastCalibrationPath.value) {
+      return '';
+    }
+    return lastCalibrationPath.value.replace(/^.*[\\/]/, '');
+  });
+
+  const showLastCalibrationSuggestion = computed(
+    () => props.stereo
+      && !calibrationFile.value
+      && !!lastCalibrationPath.value,
+  );
+
   const orderedCameraKeys = computed(() => {
     const keys = Object.keys(folderList.value);
     const ordered = cameraOrder.value.filter((key) => keys.includes(key));
@@ -108,6 +123,7 @@ export function useImportMultiCamDialog(
     subfolderLayoutLabel.value = '';
     datasetName.value = '';
     calibrationFile.value = '';
+    calibrationAutoDiscoveryFailed.value = false;
     subfolderOriginalNames.value = {};
     cameraOrder.value = [];
     defaultDisplay.value = props.stereo ? 'left' : 'center';
@@ -467,6 +483,8 @@ export function useImportMultiCamDialog(
       const path = ret.filePaths[0];
       if (folder === 'calibration') {
         calibrationFile.value = path;
+        calibrationAutoDiscoveryFailed.value = false;
+        lastCalibrationPath.value = path;
         if (saveCalibration) {
           saveCalibration(path);
         }
@@ -591,6 +609,14 @@ export function useImportMultiCamDialog(
     calibrationFile.value = '';
   }
 
+  function applyLastCalibration() {
+    if (!lastCalibrationPath.value) {
+      return;
+    }
+    calibrationFile.value = lastCalibrationPath.value;
+    calibrationAutoDiscoveryFailed.value = false;
+  }
+
   function subfolderSourceDisplayLabel(
     sourcePath: string,
     folderName: string,
@@ -622,8 +648,10 @@ export function useImportMultiCamDialog(
       discoveredPath = await findParentFolderCalibrationFile(parentPath);
     }
     if (!discoveredPath) {
+      calibrationAutoDiscoveryFailed.value = true;
       return;
     }
+    calibrationAutoDiscoveryFailed.value = false;
     calibrationFile.value = discoveredPath;
     if (discoveredFile && stashCalibrationFile) {
       stashCalibrationFile(discoveredPath, discoveredFile);
@@ -638,6 +666,10 @@ export function useImportMultiCamDialog(
     globList,
     filteredImages,
     calibrationFile,
+    lastCalibrationFileName,
+    calibrationAutoDiscoveryFailed,
+    showLastCalibrationSuggestion,
+    applyLastCalibration,
     defaultDisplay,
     displayKeys,
     displayKeysKey,

From 3ed4f86f0873215e172b328f5a198633bb38a16c Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 14:34:11 -0400
Subject: [PATCH 20/25] add datasetinfo dialog for linking and opening on
 desktop

---
 client/dive-common/components/EditorMenu.vue  |  50 ++--
 client/dive-common/components/Viewer.vue      |   1 +
 client/platform/desktop/backend/ipcService.ts |   6 +-
 .../platform/desktop/backend/native/common.ts |  56 +++-
 .../desktop/backend/native/interactive.ts     |   6 +
 client/platform/desktop/constants.ts          |   2 +
 .../frontend/components/DatasetSourceInfo.vue | 277 ++++++++++++++++++
 .../desktop/frontend/components/Recent.vue    |  20 +-
 .../frontend/components/ViewerLoader.vue      |  45 +--
 .../frontend/utils/datasetSourcePaths.ts      | 159 ++++++++++
 10 files changed, 566 insertions(+), 56 deletions(-)
 create mode 100644 client/platform/desktop/frontend/components/DatasetSourceInfo.vue
 create mode 100644 client/platform/desktop/frontend/utils/datasetSourcePaths.ts

diff --git a/client/dive-common/components/EditorMenu.vue b/client/dive-common/components/EditorMenu.vue
index 51f806e52..4366737c6 100644
--- a/client/dive-common/components/EditorMenu.vue
+++ b/client/dive-common/components/EditorMenu.vue
@@ -336,31 +336,31 @@ export default defineComponent({
               />
             </v-btn>
           </template>
-        <v-list dense>
-          <v-list-item
-            v-for="button in editButtons"
-            :key="`${button.id}-menu`"
-          >
-            <v-list-item-icon>
-              <v-btn
-                :disabled="!editingMode || button.loading"
-                :outlined="!button.active"
-                :color="button.active ? editingHeader.color : ''"
-                class="mx-1"
-                small
-                @click="button.click"
-              >
-                <pre v-if="button.mousetrap">{{ button.mousetrap[0].bind }}:</pre>
-                <v-icon :class="{ 'mdi-spin': button.loading }">
-                  {{ button.icon }}
-                </v-icon>
-              </v-btn>
-            </v-list-item-icon>
-            <v-list-item-content>
-              <v-list-item-title>{{ button.id }}</v-list-item-title>
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
+          <v-list dense>
+            <v-list-item
+              v-for="button in editButtons"
+              :key="`${button.id}-menu`"
+            >
+              <v-list-item-icon>
+                <v-btn
+                  :disabled="!editingMode || button.loading"
+                  :outlined="!button.active"
+                  :color="button.active ? editingHeader.color : ''"
+                  class="mx-1"
+                  small
+                  @click="button.click"
+                >
+                  <pre v-if="button.mousetrap">{{ button.mousetrap[0].bind }}:</pre>
+                  <v-icon :class="{ 'mdi-spin': button.loading }">
+                    {{ button.icon }}
+                  </v-icon>
+                </v-btn>
+              </v-list-item-icon>
+              <v-list-item-content>
+                <v-list-item-title>{{ button.id }}</v-list-item-title>
+              </v-list-item-content>
+            </v-list-item>
+          </v-list>
         </v-menu>
 
         <!-- Expanded mode for edit buttons -->
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index df9ded714..6a656d3a3 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -1335,6 +1335,7 @@ export default defineComponent({
         class="title pl-3 flex-row"
         style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"
       >
+        <slot name="dataset-name-prefix" />
         {{ datasetName }}
         <v-tooltip
           v-if="currentSet || sets.length > 0 || comparisonSets.length"
diff --git a/client/platform/desktop/backend/ipcService.ts b/client/platform/desktop/backend/ipcService.ts
index af3bac4a4..094ddbfba 100644
--- a/client/platform/desktop/backend/ipcService.ts
+++ b/client/platform/desktop/backend/ipcService.ts
@@ -3,7 +3,7 @@ import http from 'http';
 import fs from 'fs';
 import path from 'path';
 import {
-  app, ipcMain, shell, dialog, BrowserWindow,
+  app, ipcMain, dialog, BrowserWindow,
 } from 'electron';
 import { MultiCamImportArgs } from 'dive-common/apispec';
 import type { Pipe } from 'dive-common/apispec';
@@ -110,7 +110,9 @@ export default function register() {
     event.returnValue = getDiveVersion();
   });
   ipcMain.handle('desktop:get-app-path', (_, name: Electron.Name) => app.getPath(name));
-  ipcMain.handle('desktop:open-path', (_, targetPath: string) => shell.openPath(targetPath));
+  ipcMain.handle('desktop:open-path', async (_, targetPath: string) => (
+    common.openPathInFileManager(targetPath)
+  ));
   ipcMain.on('update-settings', async (_, s: Settings) => {
     settings.set(s);
   });
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 56623d8a2..de7175d55 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -4,6 +4,7 @@
 
 import npath from 'path';
 import fs from 'fs-extra';
+import { spawn } from 'child_process';
 import { shell } from 'electron';
 import mime from 'mime-types';
 import moment from 'moment';
@@ -1421,11 +1422,13 @@ async function finalizeMediaImport(
   // Store any stereo calibration / camera file alongside the media and normalize
   // it to the VIAME JSON camera-rig format (keeping the original).
   if (jsonMeta.multiCam?.calibration) {
-    jsonMeta.multiCam.calibrationOriginalName = realCalibrationName(jsonMeta.multiCam.calibration);
+    const calibrationSourcePath = npath.resolve(jsonMeta.multiCam.calibration);
+    jsonMeta.multiCam.calibrationSourcePath = calibrationSourcePath;
+    jsonMeta.multiCam.calibrationOriginalName = realCalibrationName(calibrationSourcePath);
     jsonMeta.multiCam.calibration = await prepareDatasetCalibration(
       settings,
       projectDirAbsPath,
-      jsonMeta.multiCam.calibration,
+      calibrationSourcePath,
     );
   }
 
@@ -1543,6 +1546,45 @@ async function openLink(url: string) {
   shell.openExternal(url);
 }
 
+/**
+ * Open a file or folder in the system file manager.
+ * Returns an empty string on success or an error message on failure.
+ *
+ * shell.openPath can hang indefinitely on Linux (never resolving its promise),
+ * which breaks ipcMain.handle callers. Files use showItemInFolder; directories
+ * use a detached platform opener so the IPC handler always replies promptly.
+ */
+async function openPathInFileManager(targetPath: string): Promise<string> {
+  if (!targetPath?.trim()) {
+    return 'No path specified';
+  }
+  const resolved = npath.resolve(targetPath.trim());
+  if (!(await fs.pathExists(resolved))) {
+    return `Path does not exist: ${resolved}`;
+  }
+
+  const stat = await fs.stat(resolved);
+  if (stat.isFile()) {
+    shell.showItemInFolder(resolved);
+    return '';
+  }
+
+  if (process.platform === 'linux') {
+    spawn('xdg-open', [resolved], { detached: true, stdio: 'ignore' }).unref();
+    return '';
+  }
+  if (process.platform === 'win32') {
+    spawn('explorer', [resolved], { detached: true, stdio: 'ignore' }).unref();
+    return '';
+  }
+  if (process.platform === 'darwin') {
+    spawn('open', [resolved], { detached: true, stdio: 'ignore' }).unref();
+    return '';
+  }
+
+  return shell.openPath(resolved);
+}
+
 async function exportDataset(settings: Settings, args: ExportDatasetArgs) {
   const projectDirInfo = await getValidatedProjectDir(settings, args.id);
   const meta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
@@ -1650,14 +1692,16 @@ async function applyCalibrationToUncalibratedStereoDatasets(
         // eslint-disable-next-line no-await-in-loop
         const fullMeta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
         if (fullMeta.multiCam) {
+          const calibrationSourcePath = npath.resolve(calibrationPath);
           // eslint-disable-next-line no-await-in-loop
           fullMeta.multiCam.calibration = await prepareDatasetCalibration(
             settings,
             projectDirInfo.basePath,
-            calibrationPath,
+            calibrationSourcePath,
           );
+          fullMeta.multiCam.calibrationSourcePath = calibrationSourcePath;
           fullMeta.multiCam.calibrationOriginalName = realCalibrationName(originalName)
-            ?? realCalibrationName(calibrationPath);
+            ?? realCalibrationName(calibrationSourcePath);
           // eslint-disable-next-line no-await-in-loop
           await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
           updatedIds.push(meta.id);
@@ -1726,6 +1770,7 @@ async function setDatasetCalibration(
     sourcePath,
   );
   fullMeta.multiCam.calibration = calibrationPath;
+  fullMeta.multiCam.calibrationSourcePath = npath.resolve(sourcePath);
   fullMeta.multiCam.calibrationOriginalName = realCalibrationName(sourcePath);
   await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
   return calibrationPath;
@@ -1825,6 +1870,8 @@ async function deleteDatasetCalibration(settings: Settings, datasetId: string):
   }
   if (fullMeta.multiCam) {
     fullMeta.multiCam.calibration = undefined;
+    fullMeta.multiCam.calibrationSourcePath = undefined;
+    fullMeta.multiCam.calibrationOriginalName = undefined;
     await _saveAsJson(projectDirInfo.metaFileAbsPath, fullMeta);
   }
 }
@@ -1852,6 +1899,7 @@ export {
   loadAnnotationFile,
   loadDetections,
   openLink,
+  openPathInFileManager,
   ingestDataFiles,
   saveDetections,
   saveMetadata,
diff --git a/client/platform/desktop/backend/native/interactive.ts b/client/platform/desktop/backend/native/interactive.ts
index 6911f0c18..3df410405 100644
--- a/client/platform/desktop/backend/native/interactive.ts
+++ b/client/platform/desktop/backend/native/interactive.ts
@@ -213,7 +213,9 @@ export class InteractiveServiceManager extends EventEmitter {
 
       const command = `${viameConstants.setupScriptAbs} && ${pyCommand}`;
 
+      // eslint-disable-next-line no-console
       console.log('[Interactive] Starting interactive service...');
+      // eslint-disable-next-line no-console
       console.log(`[Interactive] Command: ${command}`);
 
       const stderrLines: string[] = [];
@@ -239,6 +241,7 @@ export class InteractiveServiceManager extends EventEmitter {
         this.process.stderr.on('data', (data: Buffer) => {
           const message = data.toString().trim();
           if (message) {
+            // eslint-disable-next-line no-console
             console.log(`[Interactive] ${message}`);
             stderrLines.push(message);
             if (stderrLines.length > maxStderrLines) {
@@ -274,6 +277,7 @@ export class InteractiveServiceManager extends EventEmitter {
       };
 
       this.process.on('exit', (code, signal) => {
+        // eslint-disable-next-line no-console
         console.log(`[Interactive] Process exited with code ${code}, signal ${signal}`);
         this.cleanup();
         if (this.isStarting) {
@@ -632,6 +636,7 @@ export class InteractiveServiceManager extends EventEmitter {
     if (!this.process) {
       return;
     }
+    // eslint-disable-next-line no-console
     console.log('[Interactive] Shutting down interactive service...');
     await new Promise<void>((resolve) => {
       const reqId = this.generateRequestId();
@@ -641,6 +646,7 @@ export class InteractiveServiceManager extends EventEmitter {
       }
       const timeoutId = setTimeout(() => {
         if (this.process) {
+          // eslint-disable-next-line no-console
           console.log('[Interactive] Force killing interactive service...');
           this.process.kill('SIGTERM');
         }
diff --git a/client/platform/desktop/constants.ts b/client/platform/desktop/constants.ts
index 027862da2..e5b53d6dc 100644
--- a/client/platform/desktop/constants.ts
+++ b/client/platform/desktop/constants.ts
@@ -55,6 +55,8 @@ export interface MultiCamDesktop {
   // Name of the user's original calibration file (preserved for display, since
   // `calibration` may point at a converted/normalized copy).
   calibrationOriginalName?: string;
+  // Absolute path of the calibration file at import (before project copy/conversion).
+  calibrationSourcePath?: string;
   // Default Display Key for showing multiCam
   defaultDisplay: string;
 }
diff --git a/client/platform/desktop/frontend/components/DatasetSourceInfo.vue b/client/platform/desktop/frontend/components/DatasetSourceInfo.vue
new file mode 100644
index 000000000..154331978
--- /dev/null
+++ b/client/platform/desktop/frontend/components/DatasetSourceInfo.vue
@@ -0,0 +1,277 @@
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+
+import { loadMetadata } from '../api';
+import { settings, initializedSettings } from '../store/settings';
+import { buildDatasetSourceInfo } from '../utils/datasetSourcePaths';
+import type { DatasetSourceInfo as SourceInfo } from '../utils/datasetSourcePaths';
+
+export default defineComponent({
+  props: {
+    datasetId: {
+      type: String,
+      required: true,
+    },
+  },
+
+  setup(props) {
+    const dialog = ref(false);
+    const loading = ref(false);
+    const error = ref<string | null>(null);
+    const openPathError = ref<string | null>(null);
+    const info = ref<SourceInfo | null>(null);
+
+    async function loadInfo() {
+      loading.value = true;
+      error.value = null;
+      try {
+        await initializedSettings;
+        const parentId = props.datasetId.split('/')[0];
+        const meta = await loadMetadata(parentId);
+        info.value = buildDatasetSourceInfo(meta, settings.value);
+      } catch (err) {
+        error.value = String(err);
+        info.value = null;
+      } finally {
+        loading.value = false;
+      }
+    }
+
+    function openDialog() {
+      dialog.value = true;
+      loadInfo();
+    }
+
+    async function openPath(path: string) {
+      if (!path) {
+        return;
+      }
+      openPathError.value = null;
+      try {
+        const result = await window.diveDesktop.openPath(path);
+        if (result) {
+          openPathError.value = result;
+        }
+      } catch (err) {
+        openPathError.value = String(err);
+      }
+    }
+
+    return {
+      dialog,
+      loading,
+      error,
+      openPathError,
+      info,
+      openDialog,
+      openPath,
+    };
+  },
+});
+</script>
+
+<template>
+  <span class="dataset-source-info">
+    <v-tooltip bottom>
+      <template #activator="{ on, attrs }">
+        <v-btn
+          icon
+          small
+          v-bind="attrs"
+          class="dataset-source-info-btn"
+          aria-label="Dataset source locations"
+          v-on="on"
+          @click.stop="openDialog"
+        >
+          <v-icon
+            small
+            color="grey lighten-1"
+          >
+            mdi-information-outline
+          </v-icon>
+        </v-btn>
+      </template>
+      <span>Dataset source locations</span>
+    </v-tooltip>
+
+    <v-dialog
+      v-model="dialog"
+      max-width="720"
+    >
+      <v-card outlined>
+        <v-card-title class="text-h6">
+          Dataset Locations
+          <span
+            v-if="info"
+            class="text-subtitle-2 grey--text pl-2"
+          >
+            {{ info.datasetName }}
+          </span>
+        </v-card-title>
+        <v-card-text>
+          <div
+            v-if="loading"
+            class="py-4 text-center"
+          >
+            <v-progress-circular
+              indeterminate
+              color="primary"
+            />
+          </div>
+          <v-alert
+            v-else-if="error"
+            type="error"
+            dense
+            text
+          >
+            {{ error }}
+          </v-alert>
+          <v-alert
+            v-if="openPathError"
+            type="warning"
+            dense
+            text
+            class="mb-2"
+          >
+            {{ openPathError }}
+          </v-alert>
+          <table
+            v-if="info && !loading && !error"
+            class="key-value-table"
+          >
+            <tr>
+              <td>Project Directory</td>
+              <td>
+                <pre class="path-text">{{ info.projectDirectory }}</pre>
+                <span
+                  class="open-link"
+                  @click="openPath(info.projectDirectory)"
+                >
+                  <span class="text-decoration-underline">show in file manager</span>
+                  <v-icon
+                    small
+                    class="mx-1"
+                  >
+                    mdi-folder-open
+                  </v-icon>
+                </span>
+              </td>
+            </tr>
+            <tr v-if="info.mediaSource">
+              <td>{{ info.mediaSource.label }}</td>
+              <td>
+                <pre class="path-text">{{ info.mediaSource.path }}</pre>
+                <span
+                  class="open-link"
+                  @click="openPath(info.mediaSource.path)"
+                >
+                  <span class="text-decoration-underline">show in file manager</span>
+                  <v-icon
+                    small
+                    class="mx-1"
+                  >
+                    mdi-folder-open
+                  </v-icon>
+                </span>
+              </td>
+            </tr>
+            <tr v-if="info.sourceFolder">
+              <td>{{ info.sourceFolder.label }}</td>
+              <td>
+                <pre class="path-text">{{ info.sourceFolder.path }}</pre>
+                <span
+                  class="open-link"
+                  @click="openPath(info.sourceFolder.path)"
+                >
+                  <span class="text-decoration-underline">show in file manager</span>
+                  <v-icon
+                    small
+                    class="mx-1"
+                  >
+                    mdi-folder-open
+                  </v-icon>
+                </span>
+              </td>
+            </tr>
+            <tr
+              v-for="camera in info.cameraSourceFolders"
+              :key="camera.name"
+            >
+              <td>{{ camera.name }} Source Media</td>
+              <td>
+                <pre class="path-text">{{ camera.path }}</pre>
+                <span
+                  class="open-link"
+                  @click="openPath(camera.path)"
+                >
+                  <span class="text-decoration-underline">show in file manager</span>
+                  <v-icon
+                    small
+                    class="mx-1"
+                  >
+                    mdi-folder-open
+                  </v-icon>
+                </span>
+              </td>
+            </tr>
+            <tr v-if="info.sourceCalibration">
+              <td>Source Calibration</td>
+              <td>
+                <pre class="path-text">{{ info.sourceCalibration }}</pre>
+                <span
+                  class="open-link"
+                  @click="openPath(info.sourceCalibration)"
+                >
+                  <span class="text-decoration-underline">show in file manager</span>
+                  <v-icon
+                    small
+                    class="mx-1"
+                  >
+                    mdi-folder-open
+                  </v-icon>
+                </span>
+              </td>
+            </tr>
+          </table>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn
+            text
+            @click="dialog = false"
+          >
+            Close
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </span>
+</template>
+
+<style scoped lang="scss">
+@import 'dive-common/components/styles/KeyValueTable.scss';
+
+.dataset-source-info {
+  display: inline-flex;
+  vertical-align: middle;
+}
+
+.dataset-source-info-btn {
+  margin-top: -2px;
+}
+
+.path-text {
+  margin: 0 0 4px;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: inherit;
+  font-size: 12px;
+}
+
+.open-link {
+  color: var(--v-primary-lighten3);
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+}
+</style>
diff --git a/client/platform/desktop/frontend/components/Recent.vue b/client/platform/desktop/frontend/components/Recent.vue
index 3b95275d9..ae0fad5a2 100644
--- a/client/platform/desktop/frontend/components/Recent.vue
+++ b/client/platform/desktop/frontend/components/Recent.vue
@@ -27,6 +27,7 @@ import {
 } from '../store/settings';
 import { setOrGetConversionJob, cpuJobQueue, queuedCpuJobs } from '../store/jobs';
 import BrowserLink from './BrowserLink.vue';
+import DatasetSourceInfo from './DatasetSourceInfo.vue';
 import NavigationBar from './NavigationBar.vue';
 import ImportDialog from './ImportDialog.vue';
 import BulkImportDialog from './BulkImportDialog.vue';
@@ -34,6 +35,7 @@ import BulkImportDialog from './BulkImportDialog.vue';
 export default defineComponent({
   components: {
     BrowserLink,
+    DatasetSourceInfo,
     ImportButton,
     ImportDialog,
     BulkImportDialog,
@@ -544,12 +546,18 @@ export default defineComponent({
                   >
                     {{ item.name }}
                   </div>
-                  <div class="grey--text text-caption">
-                    {{
-                      item.imageListPath
-                        || item.originalBasePath
-                        || 'Data imported from several locations'
-                    }}
+                  <div class="grey--text text-caption d-flex align-center">
+                    <dataset-source-info
+                      :dataset-id="item.id"
+                      class="flex-shrink-0 mr-1"
+                    />
+                    <span>
+                      {{
+                        item.imageListPath
+                          || item.originalBasePath
+                          || 'Data imported from several locations'
+                      }}
+                    </span>
                   </div>
                 </span>
               </template>
diff --git a/client/platform/desktop/frontend/components/ViewerLoader.vue b/client/platform/desktop/frontend/components/ViewerLoader.vue
index 2cd27d2ba..74405d6cc 100644
--- a/client/platform/desktop/frontend/components/ViewerLoader.vue
+++ b/client/platform/desktop/frontend/components/ViewerLoader.vue
@@ -27,6 +27,7 @@ import {
 } from 'platform/desktop/frontend/api';
 import Export from './Export.vue';
 import JobTab from './JobTab.vue';
+import DatasetSourceInfo from './DatasetSourceInfo.vue';
 import { datasets } from '../store/dataset';
 import { settings } from '../store/settings';
 import { runningJobs } from '../store/jobs';
@@ -56,6 +57,7 @@ export default defineComponent({
   components: {
     Export,
     JobTab,
+    DatasetSourceInfo,
     RunPipelineMenu,
     SidebarContext,
     Viewer,
@@ -1272,6 +1274,19 @@ export default defineComponent({
       });
     }
 
+    async function applyCalibrationAfterImport() {
+      try {
+        const hasStereo = await loadStereoMetadata();
+        if (!hasStereo) return;
+        const result = await stereoEnable(undefined, stereoCalibrationFile);
+        if (!result.success) return;
+        stereoEnabled.value = true;
+        await ensureStereoFrame(getViewerFrame());
+      } catch (err) {
+        console.warn('[Stereo] Failed to apply calibration after import:', err);
+      }
+    }
+
     function onCalibrationImported(calibrationPath: string) {
       const dataset = datasets.value[props.id];
       if (dataset) {
@@ -1279,18 +1294,7 @@ export default defineComponent({
       }
       stereoCalibrationFile = calibrationPath;
       if (!stereoServiceWanted()) return;
-      void (async () => {
-        try {
-          const hasStereo = await loadStereoMetadata();
-          if (!hasStereo) return;
-          const result = await stereoEnable(undefined, stereoCalibrationFile);
-          if (!result.success) return;
-          stereoEnabled.value = true;
-          await ensureStereoFrame(getViewerFrame());
-        } catch (err) {
-          console.warn('[Stereo] Failed to apply calibration after import:', err);
-        }
-      })();
+      applyCalibrationAfterImport();
     }
 
     return {
@@ -1337,6 +1341,9 @@ export default defineComponent({
       @stereo-segmentation-finalize="handleStereoSegmentationFinalize"
       @stereo-track-linked="handleStereoTrackLinked"
     >
+      <template #dataset-name-prefix>
+        <dataset-source-info :dataset-id="id" />
+      </template>
       <template #title>
         <v-tabs
           icons-and-text
@@ -1358,13 +1365,13 @@ export default defineComponent({
       </template>
       <template #title-right>
         <RunPipelineMenu
-        :selected-dataset-ids="[modifiedId]"
-        :sub-type-list="subTypeList"
-        :camera-numbers="camNumbers"
-        :running-pipelines="runningPipelines"
-        :read-only-mode="readOnlyMode"
-        :time-filter="timeFilter"
-        v-bind="{ buttonOptions, menuOptions }"
+          :selected-dataset-ids="[modifiedId]"
+          :sub-type-list="subTypeList"
+          :camera-numbers="camNumbers"
+          :running-pipelines="runningPipelines"
+          :read-only-mode="readOnlyMode"
+          :time-filter="timeFilter"
+          v-bind="{ buttonOptions, menuOptions }"
         />
         <ImportAnnotations
           :dataset-id="modifiedId"
diff --git a/client/platform/desktop/frontend/utils/datasetSourcePaths.ts b/client/platform/desktop/frontend/utils/datasetSourcePaths.ts
new file mode 100644
index 000000000..a2048b139
--- /dev/null
+++ b/client/platform/desktop/frontend/utils/datasetSourcePaths.ts
@@ -0,0 +1,159 @@
+import {
+  Camera, DesktopMetadata, JsonMeta, ProjectsFolderName, Settings,
+} from 'platform/desktop/constants';
+
+export interface LabeledPath {
+  label: string;
+  path: string;
+}
+
+export interface CameraSourceFolder {
+  name: string;
+  path: string;
+}
+
+export interface DatasetSourceInfo {
+  datasetName: string;
+  projectDirectory: string;
+  mediaSource: LabeledPath | null;
+  sourceFolder: LabeledPath | null;
+  cameraSourceFolders: CameraSourceFolder[];
+  sourceCalibration: string | null;
+}
+
+function joinPath(base: string, file: string): string {
+  if (!base) {
+    return file;
+  }
+  if (!file) {
+    return base;
+  }
+  const sep = base.includes('\\') ? '\\' : '/';
+  return `${base.replace(/[\\/]+$/, '')}${sep}${file.replace(/^[\\/]+/, '')}`;
+}
+
+function dirname(filePath: string): string {
+  const sep = filePath.includes('\\') ? '\\' : '/';
+  const index = filePath.lastIndexOf(sep);
+  if (index <= 0) {
+    return filePath;
+  }
+  return filePath.slice(0, index);
+}
+
+function isAbsolutePath(filePath: string): boolean {
+  return /^([A-Za-z]:[\\/]|[\\/])/.test(filePath);
+}
+
+function getProjectDirectory(datasetId: string, appSettings: Settings | null): string {
+  const dataPath = appSettings?.dataPath ?? '';
+  const parentId = datasetId.split('/')[0];
+  return joinPath(joinPath(dataPath, ProjectsFolderName), parentId);
+}
+
+/** Original import location for a multi-camera feed (never transcoded project media). */
+function getCameraSourceFolder(camera: Camera): string {
+  if (camera.imageListPath) {
+    return camera.originalBasePath || dirname(camera.imageListPath);
+  }
+  if (camera.type === 'video' && camera.originalVideoFile) {
+    return joinPath(camera.originalBasePath, camera.originalVideoFile);
+  }
+  return camera.originalBasePath;
+}
+
+function getSingleCameraPaths(meta: JsonMeta): { mediaSource: string; sourceFolder: string } {
+  if (meta.type === 'video') {
+    return {
+      mediaSource: joinPath(meta.originalBasePath, meta.originalVideoFile),
+      sourceFolder: meta.originalBasePath,
+    };
+  }
+  if (meta.type === 'large-image') {
+    return {
+      mediaSource: joinPath(meta.originalBasePath, meta.originalLargeImageFile || ''),
+      sourceFolder: meta.originalBasePath,
+    };
+  }
+  if (meta.imageListPath) {
+    return {
+      mediaSource: meta.imageListPath,
+      sourceFolder: meta.originalBasePath || dirname(meta.imageListPath),
+    };
+  }
+  if (meta.originalBasePath) {
+    return {
+      mediaSource: meta.originalBasePath,
+      sourceFolder: meta.originalBasePath,
+    };
+  }
+  const firstImage = meta.originalImageFiles[0];
+  if (firstImage && isAbsolutePath(firstImage)) {
+    return {
+      mediaSource: firstImage,
+      sourceFolder: dirname(firstImage),
+    };
+  }
+  return { mediaSource: '', sourceFolder: '' };
+}
+
+/**
+ * Resolve the user's original calibration file path. New datasets store
+ * `calibrationSourcePath`; older datasets only stored the basename.
+ */
+function resolveCalibrationSourcePath(meta: JsonMeta): string | null {
+  const { multiCam } = meta;
+  if (!multiCam?.calibration && !multiCam?.calibrationOriginalName) {
+    return null;
+  }
+  if (multiCam.calibrationSourcePath) {
+    return multiCam.calibrationSourcePath;
+  }
+  const originalName = multiCam.calibrationOriginalName;
+  if (!originalName) {
+    return null;
+  }
+  if (meta.originalBasePath) {
+    return joinPath(meta.originalBasePath, originalName);
+  }
+  const cameras = Object.values(multiCam.cameras || {});
+  if (cameras.length > 0 && cameras[0].originalBasePath) {
+    return joinPath(dirname(cameras[0].originalBasePath), originalName);
+  }
+  return null;
+}
+
+export function buildDatasetSourceInfo(
+  meta: DesktopMetadata,
+  appSettings: Settings | null,
+): DatasetSourceInfo {
+  const projectDirectory = getProjectDirectory(meta.id, appSettings);
+  const result: DatasetSourceInfo = {
+    datasetName: meta.name,
+    projectDirectory,
+    mediaSource: null,
+    sourceFolder: null,
+    cameraSourceFolders: [],
+    sourceCalibration: resolveCalibrationSourcePath(meta),
+  };
+
+  const isMultiCam = meta.multiCam?.cameras && Object.keys(meta.multiCam.cameras).length > 0;
+  if (isMultiCam) {
+    Object.entries(meta.multiCam!.cameras).forEach(([name, camera]) => {
+      const path = getCameraSourceFolder(camera);
+      if (path) {
+        result.cameraSourceFolders.push({ name, path });
+      }
+    });
+    return result;
+  }
+
+  const paths = getSingleCameraPaths(meta);
+  if (paths.mediaSource) {
+    result.mediaSource = { label: 'Source Media', path: paths.mediaSource };
+  }
+  if (paths.sourceFolder && paths.sourceFolder !== paths.mediaSource) {
+    result.sourceFolder = { label: 'Source Folder', path: paths.sourceFolder };
+  }
+  return result;
+}

From 9bdd510d1d48ae3deb0d61861a2b38542e2978be Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 14:55:48 -0400
Subject: [PATCH 21/25] import/export camera info, destop expor multicam all

---
 .../components/ImportAnnotations.vue          |  55 +-
 client/package-lock.json                      | 709 ++++++++++++++++--
 client/package.json                           |   1 +
 client/platform/desktop/backend/ipcService.ts |   6 +
 .../platform/desktop/backend/native/common.ts | 132 +++-
 client/platform/desktop/constants.ts          |   7 +
 client/platform/desktop/frontend/api.ts       |  28 +
 .../desktop/frontend/components/Export.vue    | 100 ++-
 8 files changed, 959 insertions(+), 79 deletions(-)

diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index 46296d170..5294ddd28 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -8,7 +8,7 @@ import { clientSettings } from 'dive-common/store/settings';
 import clearLengthAttributes from 'dive-common/utils/clearLengthAttributes';
 import { cloneDeep } from 'lodash';
 import {
-  useAnnotationSets, useAnnotationSet, useHandler, useCameraStore,
+  useAnnotationSets, useAnnotationSet, useHandler, useCameraStore, useSelectedCamera,
 } from 'vue-media-annotator/provides';
 import { getResponseError } from 'vue-media-annotator/utils';
 
@@ -51,6 +51,18 @@ export default defineComponent({
     const lastCalibrationPath = ref('');
     const { reloadAnnotations, save } = useHandler();
     const cameraStore = useCameraStore();
+    const selectedCamera = useSelectedCamera();
+    const isMulticamDataset = computed(() => cameraStore.camMap.value.size > 1);
+    const activeCameraName = computed(() => {
+      if (!isMulticamDataset.value) {
+        return null;
+      }
+      if (selectedCamera.value) {
+        return selectedCamera.value;
+      }
+      const parts = (props.datasetId || '').split('/');
+      return parts.length > 1 ? parts[1] : null;
+    });
     // Camera/calibration file import is desktop-only (needs importCalibrationFile)
     // and only meaningful for stereo datasets.
     const cameraFileSupported = computed(
@@ -211,6 +223,8 @@ export default defineComponent({
       clientSettings,
       sets,
       currentSet,
+      isMulticamDataset,
+      activeCameraName,
     };
   },
 });
@@ -263,6 +277,26 @@ export default defineComponent({
         <v-card-title>
           Import Annotations
         </v-card-title>
+        <v-card-text
+          v-if="isMulticamDataset && activeCameraName"
+          class="pb-0"
+        >
+          <v-alert
+            type="info"
+            outlined
+            class="mb-0 active-camera-alert"
+          >
+            <div class="active-camera-label">
+              Annotations import to the active camera
+            </div>
+            <div class="active-camera-name d-flex align-center">
+              <v-icon class="mr-2">
+                mdi-camera
+              </v-icon>
+              {{ activeCameraName }}
+            </div>
+          </v-alert>
+        </v-card-text>
         <v-card-text>
           Multiple Data types can be imported:
           <ul>
@@ -404,3 +438,22 @@ export default defineComponent({
     </template>
   </v-menu>
 </template>
+
+<style scoped>
+.active-camera-alert {
+  padding: 10px 12px;
+}
+
+.active-camera-label {
+  font-size: 0.8125rem;
+  line-height: 1.25;
+  margin-bottom: 6px;
+  opacity: 0.85;
+}
+
+.active-camera-name {
+  font-size: 1.25rem;
+  font-weight: 600;
+  line-height: 1.3;
+}
+</style>
diff --git a/client/package-lock.json b/client/package-lock.json
index 01a1adfd1..0d84b5716 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -14,6 +14,7 @@
         "@mdi/font": "^6.2.95",
         "@sentry/browser": "^5.24.2",
         "@sentry/integrations": "^5.24.2",
+        "archiver": "^7.0.1",
         "axios": "^1.17.0",
         "csv-stringify": "^5.6.0",
         "d3": "^5.12.0",
@@ -2108,16 +2109,6 @@
         "node": ">=16.4"
       }
     },
-    "node_modules/@electron/universal/node_modules/brace-expansion": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
-      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/@electron/universal/node_modules/fs-extra": {
       "version": "11.3.4",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
@@ -2755,7 +2746,6 @@
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
@@ -2773,7 +2763,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
       "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2786,7 +2775,6 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2799,14 +2787,12 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@isaacs/cliui/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
@@ -2824,7 +2810,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -2840,7 +2825,6 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
@@ -3450,7 +3434,6 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -5449,6 +5432,18 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "license": "MIT",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -5584,7 +5579,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -5594,7 +5588,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -5871,6 +5864,182 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
+    "node_modules/archiver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "archiver-utils": "^5.0.2",
+        "async": "^3.2.4",
+        "buffer-crc32": "^1.0.0",
+        "readable-stream": "^4.0.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^3.0.0",
+        "zip-stream": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/archiver-utils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+      "license": "MIT",
+      "dependencies": {
+        "glob": "^10.0.0",
+        "graceful-fs": "^4.2.0",
+        "is-stream": "^2.0.1",
+        "lazystream": "^1.0.0",
+        "lodash": "^4.17.15",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/archiver-utils/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/archiver/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/archiver/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/archiver/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/aria-query": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
@@ -6124,6 +6293,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
+    },
     "node_modules/async-exit-hook": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
@@ -6235,6 +6410,20 @@
         "dequal": "^2.0.3"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.1.tgz",
+      "integrity": "sha512-aiqre1Nr0B/6DgE2N5vwTc+2/oQZ4Wh1t4NznYY4E00y8LCt6NqdRv81so00oo27D8MVKTpUa/MwUUtBLXCoDw==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "react-native-b4a": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-b4a": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.4.17",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.17.tgz",
@@ -6291,14 +6480,104 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/bare-events": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.9.1.tgz",
+      "integrity": "sha512-Z0oHEHAFDZkffN8Qc39zNZjQlMDkPJRyyyZieU1VH7u8c5S+qHZ2S8ixdKIAxEjfHO7FJxXmJWgteOghVanIsg==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "bare-abort-controller": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-fs": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.7.2.tgz",
+      "integrity": "sha512-aTvMFUWkBmjzKtEQMDGGDNF8bkfpD5N1b/FCwt7A3wrU4t1o/e/85Wzkluh6JlODCjqVESYCkQCdTXqZ9G7VFg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.5.4",
+        "bare-path": "^3.0.0",
+        "bare-stream": "^2.6.4",
+        "bare-url": "^2.2.2",
+        "fast-fifo": "^1.3.2"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.9.2.tgz",
+      "integrity": "sha512-h530JsrkYi8518ZfR57GHaLoI5YzXkGGEV0Y+mf4KYPBn4OnNajiznwkDq7FgE+Vnmyss9Utnzi44y7sowiAXA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "bare": ">=1.14.0"
+      }
+    },
+    "node_modules/bare-path": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.1.tgz",
+      "integrity": "sha512-ghj2DSK/2e99a1anTVPCV4m4YIYtrbXhfM7V3D7XZLOTsybnYyaJloymGqssQc8l/or0UoDyRtNQkmkEF/ysgQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-os": "^3.0.1"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.13.3.tgz",
+      "integrity": "sha512-Kc+brLqvEqGkjyfiwJmImAOqLZL7OsoLKuavx+hJjgVV3nLTOjloJyPMFxjUPerGGHrNH0fLU06jjykMLWrERQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.8.1",
+        "streamx": "^2.25.0",
+        "teex": "^1.0.1"
+      },
+      "peerDependencies": {
+        "bare-abort-controller": "*",
+        "bare-buffer": "*",
+        "bare-events": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        },
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-events": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-url": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.5.tgz",
+      "integrity": "sha512-K+y9xF1tN+CdPu4qWwr0QiK1Al07eFPGYK5M2pDXcmHdMdgC/tT/bpmMe1hrmRHaidKLkXrC+cRNYf3XVDUhSQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-path": "^3.0.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -6399,10 +6678,9 @@
       "optional": true
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
+      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -6866,7 +7144,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -6909,6 +7186,62 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/compress-commons": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
+      "license": "MIT",
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "crc32-stream": "^6.0.0",
+        "is-stream": "^2.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/compress-commons/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/compress-commons/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -7020,9 +7353,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -7049,6 +7380,71 @@
         "buffer": "^5.1.0"
       }
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/crc32-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+      "license": "MIT",
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/crc32-stream/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/crc32-stream/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/cross-env": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
@@ -7071,7 +7467,6 @@
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -7086,7 +7481,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7096,7 +7490,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -7109,7 +7502,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7119,7 +7511,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
@@ -7904,7 +8295,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/editorconfig": {
@@ -8198,7 +8588,6 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/encodeurl": {
@@ -9139,16 +9528,33 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
     },
+    "node_modules/events-universal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.7.0"
+      }
+    },
     "node_modules/expect-type": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
@@ -9282,6 +9688,12 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "license": "MIT"
+    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -9546,7 +9958,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
       "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
@@ -9563,7 +9974,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -10021,7 +10431,6 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/graphemer": {
@@ -10312,7 +10721,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -10327,8 +10735,7 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
       "version": "5.3.1",
@@ -10405,7 +10812,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ini": {
@@ -10641,7 +11047,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -10791,6 +11196,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
@@ -10916,7 +11333,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
@@ -11025,13 +11441,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -11385,6 +11794,54 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lazystream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
+    "node_modules/lazystream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/lazystream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/lazystream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/lerc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
@@ -11758,7 +12215,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
       "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
-      "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -11999,7 +12455,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -12229,7 +12684,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
       "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-      "dev": true,
       "license": "BlueOak-1.0.0"
     },
     "node_modules/pako": {
@@ -12317,7 +12771,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
       "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
@@ -12334,7 +12787,6 @@
       "version": "10.2.2",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
       "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "14 || >=16.14"
@@ -12560,6 +13012,21 @@
         "node": "^20.17.0 || >=22.9.0"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -12809,6 +13276,27 @@
         "node": ">= 6"
       }
     },
+    "node_modules/readdir-glob": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.1.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/minimatch": {
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -13151,7 +13639,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -13655,11 +14142,21 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/streamx": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.28.0.tgz",
+      "integrity": "sha512-1Yowhzjf0ivGMrTIkY9hav5TxobO9qIVqUE41fiCGMGgc3CLlf4MY+9AHmZqBWgDTue0fY9zWjYFVyf6Diuobw==",
+      "license": "MIT",
+      "dependencies": {
+        "events-universal": "^1.0.0",
+        "fast-fifo": "^1.3.2",
+        "text-decoder": "^1.1.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
@@ -13669,7 +14166,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -13685,7 +14181,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -13779,7 +14274,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -13793,7 +14287,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -13922,6 +14415,18 @@
         "node": ">=18"
       }
     },
+    "node_modules/tar-stream": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.2.0.tgz",
+      "integrity": "sha512-ojzvCvVaNp6aOTFmG7jaRD0meowIAuPc3cMMhSgKiVWws1GyHbGd/xvnyuRKcKlMpt3qvxx6r0hreCNITP9hIg==",
+      "license": "MIT",
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "bare-fs": "^4.5.5",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
     "node_modules/tar/node_modules/yallist": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
@@ -13932,6 +14437,15 @@
         "node": ">=18"
       }
     },
+    "node_modules/teex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
+      "license": "MIT",
+      "dependencies": {
+        "streamx": "^2.12.5"
+      }
+    },
     "node_modules/temp-file": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
@@ -14068,6 +14582,15 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/text-decoder": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -14643,7 +15166,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/utils-merge": {
@@ -15567,7 +16089,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -15752,6 +16273,60 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/zip-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+      "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
+      "license": "MIT",
+      "dependencies": {
+        "archiver-utils": "^5.0.0",
+        "compress-commons": "^6.0.2",
+        "readable-stream": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/zip-stream/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/zip-stream/node_modules/readable-stream": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+      "license": "MIT",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/zstddec": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.2.0.tgz",
diff --git a/client/package.json b/client/package.json
index 580e19025..602997c67 100644
--- a/client/package.json
+++ b/client/package.json
@@ -36,6 +36,7 @@
     "@mdi/font": "^6.2.95",
     "@sentry/browser": "^5.24.2",
     "@sentry/integrations": "^5.24.2",
+    "archiver": "^7.0.1",
     "axios": "^1.17.0",
     "csv-stringify": "^5.6.0",
     "d3": "^5.12.0",
diff --git a/client/platform/desktop/backend/ipcService.ts b/client/platform/desktop/backend/ipcService.ts
index 094ddbfba..91a5664d1 100644
--- a/client/platform/desktop/backend/ipcService.ts
+++ b/client/platform/desktop/backend/ipcService.ts
@@ -9,6 +9,7 @@ import { MultiCamImportArgs } from 'dive-common/apispec';
 import type { Pipe } from 'dive-common/apispec';
 import {
   DesktopJobUpdate, RunPipeline, RunTraining, Settings, ExportDatasetArgs,
+  ExportMulticamEverythingArgs,
   DesktopMediaImportResponse,
   ExportTrainedPipeline,
   ConversionArgs,
@@ -126,6 +127,11 @@ export default function register() {
     return ret;
   });
 
+  ipcMain.handle('export-multicam-everything', async (_, args: ExportMulticamEverythingArgs) => {
+    const ret = await common.exportMulticamEverything(settings.get(), args);
+    return ret;
+  });
+
   ipcMain.handle('autodiscover-data', async () => {
     const ret = await common.autodiscoverData(settings.get());
     return ret;
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index de7175d55..6d4722cc6 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -3,8 +3,11 @@
  */
 
 import npath from 'path';
+import os from 'os';
 import fs from 'fs-extra';
 import { spawn } from 'child_process';
+import { createWriteStream } from 'fs';
+import archiver from 'archiver';
 import { shell } from 'electron';
 import mime from 'mime-types';
 import moment from 'moment';
@@ -41,11 +44,12 @@ import {
   websafeImageTypes, websafeVideoTypes, otherImageTypes, otherVideoTypes, fileVideoTypes,
   MultiType, JsonMetaRegEx, largeImageDesktopTypes,
 } from 'dive-common/constants';
+import { orderedMultiCamCameraNames } from 'dive-common/multicamDisplay';
 import { pickStereoCalibrationFileName } from 'dive-common/stereoParentFolder';
 import {
   JsonMeta, Settings, JsonMetaCurrentVersion, DesktopMetadata,
   RunTraining, ExportDatasetArgs, DesktopMediaImportResponse,
-  ExportConfigurationArgs, JobsFolderName, JobsOutputFolderName, ProjectsFolderName,
+  ExportConfigurationArgs, ExportMulticamEverythingArgs, JobsFolderName, JobsOutputFolderName, ProjectsFolderName,
   PipelinesFolderName, ConversionArgs,
   JobType, LastCalibrationBaseName,
 } from 'platform/desktop/constants';
@@ -1585,6 +1589,131 @@ async function openPathInFileManager(targetPath: string): Promise<string> {
   return shell.openPath(resolved);
 }
 
+function buildExportMetaJson(meta: JsonMeta): Record<string, unknown> {
+  const output: Record<string, unknown> = { ...meta };
+  if (meta.type === 'image-sequence') {
+    const files = meta.transcodedImageFiles?.length
+      ? meta.transcodedImageFiles
+      : meta.originalImageFiles?.map((filePath) => npath.basename(filePath)) ?? [];
+    output.imageData = files.map((filename) => ({ filename }));
+  } else if (meta.type === 'video') {
+    const filename = meta.transcodedVideoFile || meta.originalVideoFile;
+    if (filename) {
+      output.video = { filename };
+    }
+  }
+  return output;
+}
+
+async function writeDatasetExportContents(
+  settings: Settings,
+  destDir: string,
+  datasetId: string,
+  excludeBelowThreshold: boolean,
+  typeFilter: Set<string>,
+): Promise<void> {
+  const projectDirInfo = await getValidatedProjectDir(settings, datasetId);
+  const meta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
+  const data = await loadAnnotationFile(projectDirInfo.trackFileAbsPath);
+  const serializeOptions = {
+    excludeBelowThreshold,
+    header: true,
+  };
+
+  await fs.ensureDir(destDir);
+  await fs.writeJSON(npath.join(destDir, 'meta.json'), buildExportMetaJson(meta), { spaces: 2 });
+  await dive.serializeFile(
+    npath.join(destDir, 'annotations.dive.json'),
+    data,
+    meta,
+    typeFilter,
+    serializeOptions,
+  );
+  await viameSerializers.serializeFile(
+    npath.join(destDir, 'annotations.viame.csv'),
+    data,
+    meta,
+    typeFilter,
+    serializeOptions,
+  );
+}
+
+async function zipDirectory(sourceDir: string, destZipPath: string): Promise<void> {
+  await new Promise<void>((resolve, reject) => {
+    const output = createWriteStream(destZipPath);
+    const archive = archiver('zip', { zlib: { level: 9 } });
+    output.on('close', () => resolve());
+    output.on('error', reject);
+    archive.on('error', reject);
+    archive.pipe(output);
+    archive.directory(sourceDir, false);
+    archive.finalize();
+  });
+}
+
+async function exportMulticamEverything(
+  settings: Settings,
+  args: ExportMulticamEverythingArgs,
+): Promise<string> {
+  const parentId = args.id.split('/')[0];
+  const parentDirInfo = await getValidatedProjectDir(settings, parentId);
+  const parentMeta = await loadJsonMetadata(parentDirInfo.metaFileAbsPath);
+  if (parentMeta.type !== MultiType || !parentMeta.multiCam) {
+    throw new Error('Everything export is only available for multi-camera datasets.');
+  }
+
+  const cameraNames = orderedMultiCamCameraNames({
+    cameras: parentMeta.multiCam.cameras,
+    defaultDisplay: parentMeta.multiCam.defaultDisplay,
+  });
+  if (!cameraNames.length) {
+    throw new Error('Multi-camera dataset does not list any cameras.');
+  }
+
+  const tempDir = await fs.mkdtemp(npath.join(os.tmpdir(), 'dive-export-'));
+  try {
+    const datasetDir = npath.join(tempDir, parentMeta.name);
+    await fs.ensureDir(datasetDir);
+    await fs.writeJSON(
+      npath.join(datasetDir, 'multiCam.json'),
+      parentMeta.multiCam,
+      { spaces: 2 },
+    );
+    await writeDatasetExportContents(
+      settings,
+      datasetDir,
+      parentId,
+      args.exclude,
+      args.typeFilter,
+    );
+
+    const calibrationPath = parentMeta.multiCam.calibration
+      ?? await findParentFolderCalibrationFile(parentDirInfo.basePath);
+    if (calibrationPath && await fs.pathExists(calibrationPath)) {
+      const calibrationName = parentMeta.multiCam.calibrationOriginalName
+        ?? npath.basename(calibrationPath);
+      await fs.copy(calibrationPath, npath.join(datasetDir, calibrationName));
+    }
+
+    for (let i = 0; i < cameraNames.length; i += 1) {
+      const cameraName = cameraNames[i];
+      // eslint-disable-next-line no-await-in-loop
+      await writeDatasetExportContents(
+        settings,
+        npath.join(datasetDir, cameraName),
+        `${parentId}/${cameraName}`,
+        args.exclude,
+        args.typeFilter,
+      );
+    }
+
+    await zipDirectory(tempDir, args.path);
+  } finally {
+    await fs.remove(tempDir);
+  }
+  return args.path;
+}
+
 async function exportDataset(settings: Settings, args: ExportDatasetArgs) {
   const projectDirInfo = await getValidatedProjectDir(settings, args.id);
   const meta = await loadJsonMetadata(projectDirInfo.metaFileAbsPath);
@@ -1887,6 +2016,7 @@ export {
   checkDataset,
   exportConfiguration,
   exportDataset,
+  exportMulticamEverything,
   finalizeMediaImport,
   getPipelineList,
   deleteTrainedPipeline,
diff --git a/client/platform/desktop/constants.ts b/client/platform/desktop/constants.ts
index e5b53d6dc..5b24868ff 100644
--- a/client/platform/desktop/constants.ts
+++ b/client/platform/desktop/constants.ts
@@ -283,3 +283,10 @@ export interface ExportConfigurationArgs {
     id: string;
    path: string;
 }
+
+export interface ExportMulticamEverythingArgs {
+  id: string;
+  exclude: boolean;
+  path: string;
+  typeFilter: Set<string>;
+}
diff --git a/client/platform/desktop/frontend/api.ts b/client/platform/desktop/frontend/api.ts
index 6cde51edc..7d6acd865 100644
--- a/client/platform/desktop/frontend/api.ts
+++ b/client/platform/desktop/frontend/api.ts
@@ -17,6 +17,7 @@ import {
 import {
   DesktopMetadata, NvidiaSmiReply,
   RunPipeline, RunTraining, ExportTrainedPipeline, ExportDatasetArgs, ExportConfigurationArgs,
+  ExportMulticamEverythingArgs,
   DesktopMediaImportResponse, ConversionArgs, JobType,
   DesktopJob,
 } from 'platform/desktop/constants';
@@ -269,6 +270,32 @@ async function exportConfiguration(id: string): Promise<string> {
   return '';
 }
 
+async function exportMulticamEverything(
+  id: string,
+  exclude: boolean,
+  typeFilter: readonly string[],
+): Promise<string> {
+  const parentId = id.split('/')[0];
+  const location = await window.diveDesktop.showSaveDialog({
+    title: 'Export Multicamera Dataset',
+    defaultPath: joinPath(
+      await window.diveDesktop.getAppPath('home'),
+      `${parentId}.zip`,
+    ),
+    filters: [{ name: 'Zip archive', extensions: ['zip'] }],
+  });
+  if (!location.canceled && location.filePath) {
+    const args: ExportMulticamEverythingArgs = {
+      id: parentId,
+      exclude,
+      path: location.filePath,
+      typeFilter: new Set(typeFilter),
+    };
+    return window.diveDesktop.invoke('export-multicam-everything', args);
+  }
+  return '';
+}
+
 async function cancelJob(job: DesktopJob): Promise<void> {
   return window.diveDesktop.invoke('cancel-job', job);
 }
@@ -597,6 +624,7 @@ export {
   /* Nonstandard APIs */
   exportDataset,
   exportConfiguration,
+  exportMulticamEverything,
   finalizeImport,
   convert,
   importMedia,
diff --git a/client/platform/desktop/frontend/components/Export.vue b/client/platform/desktop/frontend/components/Export.vue
index cfeacdfaf..561f216a2 100644
--- a/client/platform/desktop/frontend/components/Export.vue
+++ b/client/platform/desktop/frontend/components/Export.vue
@@ -3,13 +3,18 @@ import {
   defineComponent, reactive, computed, toRef, watch, ref,
 } from 'vue';
 
-import { usePendingSaveCount, useHandler, useTrackFilters } from 'vue-media-annotator/provides';
+import {
+  usePendingSaveCount, useHandler, useTrackFilters, useSelectedCamera,
+} from 'vue-media-annotator/provides';
 import AutosavePrompt from 'dive-common/components/AutosavePrompt.vue';
+import { MultiType } from 'dive-common/constants';
 import {
-  loadMetadata, exportDataset, exportConfiguration, exportCalibrationFile,
+  loadMetadata, exportDataset, exportConfiguration, exportCalibrationFile, exportMulticamEverything,
 } from 'platform/desktop/frontend/api';
 import type { JsonMeta } from 'platform/desktop/constants';
 
+type ExportType = 'dataset' | 'configuration' | 'trackJSON' | 'coco' | 'everything';
+
 export default defineComponent({
   name: 'Export',
 
@@ -41,14 +46,18 @@ export default defineComponent({
       outPath: '',
     });
     const savePrompt = ref(false);
+    const pendingExportType = ref<ExportType>('dataset');
 
     const pendingSaveCount = usePendingSaveCount();
     const { save } = useHandler();
     const { checkedTypes } = useTrackFilters();
+    const selectedCamera = useSelectedCamera();
+
+    const parentId = computed(() => props.id.split('/')[0]);
 
     watch(toRef(data, 'menuOpen'), async (newval) => {
       if (newval) {
-        data.meta = await loadMetadata(props.id);
+        data.meta = await loadMetadata(parentId.value);
       } else {
         data.err = null;
         data.outPath = '';
@@ -60,6 +69,16 @@ export default defineComponent({
         ? Object.keys(data.meta.confidenceFilters || {})
         : []));
 
+    const isMulticamDataset = computed(() => data.meta?.type === MultiType);
+
+    const activeCameraName = computed(() => {
+      if (selectedCamera.value) {
+        return selectedCamera.value;
+      }
+      const parts = props.id.split('/');
+      return parts.length > 1 ? parts[1] : null;
+    });
+
     const calibrationFile = computed(() => data.meta?.multiCam?.calibration ?? null);
     const cameraFileSupported = computed(
       () => data.meta?.subType === 'stereo' && !!calibrationFile.value,
@@ -75,7 +94,7 @@ export default defineComponent({
       if (location.canceled || !location.filePath) return;
       try {
         data.err = null;
-        await exportCalibrationFile(props.id, location.filePath);
+        await exportCalibrationFile(parentId.value, location.filePath);
         data.outPath = location.filePath;
       } catch (err) {
         data.err = err;
@@ -83,29 +102,35 @@ export default defineComponent({
       }
     }
 
-    async function doExport({ type, forceSave = false }: { type: 'dataset' | 'configuration' | 'trackJSON' | 'coco'; forceSave?: boolean}) {
+    async function doExport({ type, forceSave = false }: { type: ExportType; forceSave?: boolean}) {
       if (pendingSaveCount.value > 0 && forceSave) {
         await save();
         savePrompt.value = false;
       } else if (pendingSaveCount.value > 0) {
+        pendingExportType.value = type;
         savePrompt.value = true;
         return;
       }
       try {
+        const typeFilter = data.excludeUncheckedTypes ? checkedTypes.value : [];
         if (type === 'dataset') {
-          const typeFilter = data.excludeUncheckedTypes ? checkedTypes.value : [];
           data.err = null;
           data.outPath = await exportDataset(props.id, data.excludeBelowThreshold, typeFilter);
         } else if (type === 'trackJSON') {
-          const typeFilter = data.excludeUncheckedTypes ? checkedTypes.value : [];
           data.err = null;
           data.outPath = await exportDataset(props.id, data.excludeBelowThreshold, typeFilter, 'json');
         } else if (type === 'coco') {
-          const typeFilter = data.excludeUncheckedTypes ? checkedTypes.value : [];
           data.err = null;
           data.outPath = await exportDataset(props.id, data.excludeBelowThreshold, typeFilter, 'coco');
         } else if (type === 'configuration') {
           data.outPath = await exportConfiguration(props.id);
+        } else if (type === 'everything') {
+          data.err = null;
+          data.outPath = await exportMulticamEverything(
+            parentId.value,
+            data.excludeBelowThreshold,
+            typeFilter,
+          );
         }
       } catch (err) {
         data.err = err;
@@ -120,8 +145,11 @@ export default defineComponent({
       cameraFileSupported,
       calibrationFile,
       savePrompt,
+      pendingExportType,
       thresholds,
       checkedTypes,
+      isMulticamDataset,
+      activeCameraName,
     };
   },
 });
@@ -197,7 +225,7 @@ export default defineComponent({
           </v-dialog>
           <AutosavePrompt
             v-model="savePrompt"
-            @save="doExport({ type: 'dataset', forceSave: true })"
+            @save="doExport({ type: pendingExportType, forceSave: true })"
           />
           <v-alert
             v-if="data.outPath"
@@ -207,7 +235,25 @@ export default defineComponent({
           >
             Export succeeded.
           </v-alert>
-          <div>Export to Annotations</div>
+          <v-alert
+            v-if="isMulticamDataset && activeCameraName"
+            type="info"
+            outlined
+            class="mb-2 active-camera-alert"
+          >
+            <div class="active-camera-label">
+              Annotations export from the active camera
+            </div>
+            <div class="active-camera-name d-flex align-center">
+              <v-icon class="mr-2">
+                mdi-camera
+              </v-icon>
+              {{ activeCameraName }}
+            </div>
+          </v-alert>
+          <div v-else>
+            Export to Annotations
+          </div>
           <template v-if="thresholds.length">
             <v-checkbox
               v-model="data.excludeBelowThreshold"
@@ -301,7 +347,41 @@ export default defineComponent({
             </v-btn>
           </v-card-actions>
         </template>
+        <template v-if="isMulticamDataset">
+          <v-card-text class="pb-0">
+            Zip all cameras: annotations, calibration, and dataset metadata.
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer />
+            <v-btn
+              depressed
+              block
+              @click="doExport({ type: 'everything' })"
+            >
+              Everything
+            </v-btn>
+          </v-card-actions>
+        </template>
       </v-card>
     </template>
   </v-menu>
 </template>
+
+<style scoped>
+.active-camera-alert {
+  padding: 10px 12px;
+}
+
+.active-camera-label {
+  font-size: 0.8125rem;
+  line-height: 1.25;
+  margin-bottom: 6px;
+  opacity: 0.85;
+}
+
+.active-camera-name {
+  font-size: 1.25rem;
+  font-weight: 600;
+  line-height: 1.3;
+}
+</style>

From 8b08c569bae2cc0166ed68112e67f8e97a4741e9 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 16:11:50 -0400
Subject: [PATCH 22/25] use pipelines queue for VIAME access for calibration
 conversion

---
 server/dive_server/crud_dataset.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index a3790fd51..51890f5d2 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -1247,11 +1247,9 @@ def enqueue_calibration_conversion(
     JSON camera-rig format (for display). The pipeline can consume the original file
     directly, so this is best-effort and never blocks the request.
     """
-    queue = (
-        f'{user["login"]}@private'
-        if user.get(constants.UserPrivateQueueEnabledMarker, False)
-        else 'celery'
-    )
+    job_is_private = user.get(constants.UserPrivateQueueEnabledMarker, False)
+    # convert_cam_format.py lives on pipeline workers (VIAME image), not celery workers.
+    queue = f'{user["login"]}@private' if job_is_private else 'pipelines'
     token = Token().createToken(user=user, days=1)
     tasks.convert_calibration.apply_async(
         queue=queue,
@@ -1259,7 +1257,7 @@ def enqueue_calibration_conversion(
             itemId=item_id,
             girder_job_title=f"Converting calibration {item_name}",
             girder_client_token=str(token["_id"]),
-            girder_job_type="private",
+            girder_job_type="private" if job_is_private else "pipelines",
         ),
     )
 

From 547f790cce43ce826bf0c5d19d15ea8bbb4a3ce4 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 16:40:27 -0400
Subject: [PATCH 23/25] swap to creating a jsonCalibration file as another item

---
 client/dive-common/apispec.ts                 |  15 +-
 .../components/CalibrationDialog.vue          |  28 +-
 .../components/CalibrationMenu.vue            |  13 +-
 client/dive-common/constants.ts               |   5 +-
 .../web-girder/api/dataset.service.ts         |  21 +-
 client/platform/web-girder/api/index.ts       |  11 +-
 server/dive_server/crud_dataset.py            | 438 +++++++++++++-----
 server/dive_tasks/tasks.py                    |  59 ++-
 server/dive_utils/constants.py                |   6 +-
 server/dive_utils/models.py                   |   2 +
 server/dive_utils/types.py                    |   9 +-
 server/tests/test_create_multicam.py          |  25 +-
 server/tests/test_multicam_export_clone.py    |  23 +-
 13 files changed, 485 insertions(+), 170 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index cd4b21b51..956215343 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -226,15 +226,18 @@ interface DatasetStereoCalibration {
 }
 
 interface DatasetCalibrationResult {
-  /** Parsed calibration parameters. May be absent when a calibration file is
-   * present but could not be parsed (e.g. an unconverted non-JSON format). */
+  /** Parsed calibration parameters from the JSON camera-rig file. */
   calibration?: DatasetStereoCalibration
+  /** Source calibration item (calibrationFile). Used by pipelines and download. */
   itemId?: string;
-  /** Name of the calibration file currently associated with the dataset. */
-  path?: string;
-  /** User's original calibration filename (may differ from `path` when the file
-   * was converted/normalized on import). */
+  /** JSON camera-rig item (jsonCalibrationFile). Used for display parameters. */
+  jsonItemId?: string;
+  /** Source calibration filename. */
   originalName?: string;
+  /** JSON camera-rig filename. */
+  jsonPath?: string;
+  /** Alias for jsonPath (legacy). */
+  path?: string;
 }
 
 interface Api {
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index f13470856..15dd97e66 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -10,7 +10,8 @@ export default defineComponent({
   props: {
     value: { type: Boolean, required: true },
     calibration: { type: Object as PropType<DatasetStereoCalibration | undefined>, default: undefined },
-    fileName: { type: String as PropType<string | undefined>, default: undefined },
+    sourceFileName: { type: String as PropType<string | undefined>, default: undefined },
+    jsonFileName: { type: String as PropType<string | undefined>, default: undefined },
     showDownload: { type: Boolean, default: true },
     showDelete: { type: Boolean, default: true },
   },
@@ -57,9 +58,15 @@ export default defineComponent({
       </v-toolbar>
 
       <v-card-text class="pa-4">
-        <div v-if="fileName" class="mb-4">
-          <span class="text-subtitle-1 font-weight-bold mr-2">File:</span>
-          <span>{{ fileName }}</span>
+        <div v-if="sourceFileName || jsonFileName" class="mb-4">
+          <div v-if="sourceFileName" class="mb-2">
+            <span class="text-subtitle-1 font-weight-bold mr-2">Source file:</span>
+            <span>{{ sourceFileName }}</span>
+          </div>
+          <div v-if="jsonFileName">
+            <span class="text-subtitle-1 font-weight-bold mr-2">JSON file:</span>
+            <span>{{ jsonFileName }}</span>
+          </div>
         </div>
         <div v-if="calibration" class="mb-6">
           <div class="text-subtitle-1 font-weight-bold mb-2">
@@ -162,6 +169,15 @@ export default defineComponent({
             </v-col>
           </v-row>
         </div>
+        <div v-else-if="sourceFileName || jsonFileName">
+          <div class="text-subtitle-1 font-weight-bold mb-2">
+            Calibration Not Ready
+          </div>
+          <div>
+            A calibration file is linked, but its JSON parameters are not available yet.
+            Conversion to the JSON camera-rig format may still be running.
+          </div>
+        </div>
         <div v-else>
           <div class="text-subtitle-1 font-weight-bold mb-2">
             No Calibration Loaded
@@ -182,13 +198,13 @@ export default defineComponent({
           Cancel
         </v-btn>
         <v-spacer />
-        <v-btn v-if="fileName && showDelete" color="red" outlined @click="deleteCalibration">
+        <v-btn v-if="(sourceFileName || jsonFileName) && showDelete" color="red" outlined @click="deleteCalibration">
           <v-icon left>
             mdi-delete-outline
           </v-icon>
           Delete
         </v-btn>
-        <v-btn v-if="fileName && showDownload" color="primary" @click="downloadCalibration">
+        <v-btn v-if="(sourceFileName || jsonFileName) && showDownload" color="primary" @click="downloadCalibration">
           <v-icon left>
             mdi-download
           </v-icon>
diff --git a/client/dive-common/components/CalibrationMenu.vue b/client/dive-common/components/CalibrationMenu.vue
index 20cc7863b..d21878bc5 100644
--- a/client/dive-common/components/CalibrationMenu.vue
+++ b/client/dive-common/components/CalibrationMenu.vue
@@ -47,8 +47,14 @@ export default defineComponent({
 
     const hasCalibration = computed(() => !!calibrationResult.value);
 
+    const sourceFileName = computed(
+      () => calibrationResult.value?.originalName,
+    );
+    const jsonFileName = computed(
+      () => calibrationResult.value?.jsonPath ?? calibrationResult.value?.path,
+    );
     const calibrationFileName = computed(
-      () => calibrationResult.value?.originalName ?? calibrationResult.value?.path,
+      () => sourceFileName.value ?? jsonFileName.value,
     );
 
     const openCalibrationDialog = () => {
@@ -71,6 +77,8 @@ export default defineComponent({
       showCalibrationDialog,
       calibrationResult,
       hasCalibration,
+      sourceFileName,
+      jsonFileName,
       calibrationFileName,
       openCalibrationDialog,
       canDownload: !!downloadCalibration,
@@ -117,7 +125,8 @@ export default defineComponent({
     <CalibrationDialog
       v-model="showCalibrationDialog"
       :calibration="calibrationResult?.calibration"
-      :file-name="calibrationFileName"
+      :source-file-name="sourceFileName"
+      :json-file-name="jsonFileName"
       :show-download="canDownload"
       :show-delete="canDelete"
       @download="onDownload"
diff --git a/client/dive-common/constants.ts b/client/dive-common/constants.ts
index a8a1d09bd..620750528 100644
--- a/client/dive-common/constants.ts
+++ b/client/dive-common/constants.ts
@@ -170,8 +170,10 @@ const zipFileTypes = [
 ];
 
 const stereoPipelineMarker = 'measurement';
-/** Girder item meta key marking a stereoscopic calibration file in the dataset folder. */
+/** Girder item meta key marking the original stereoscopic calibration upload (pipeline input). */
 const calibrationFileMarker = 'calibrationFile';
+/** Girder item meta key marking the JSON camera-rig used for calibration display. */
+const jsonCalibrationFileMarker = 'jsonCalibrationFile';
 /** Legacy common_stereo category key; never shown in the run-pipeline menu. */
 const hiddenPipelineCategories = ['stereo'];
 /** Pipeline name/category substrings hidden from the web run-pipeline menu. */
@@ -213,6 +215,7 @@ export {
   zipFileTypes,
   stereoPipelineMarker,
   calibrationFileMarker,
+  jsonCalibrationFileMarker,
   hiddenPipelineCategories,
   webExcludedPipelineTerms,
   multiCamPipelineMarkers,
diff --git a/client/platform/web-girder/api/dataset.service.ts b/client/platform/web-girder/api/dataset.service.ts
index b2c6078b8..13c4f1b7e 100644
--- a/client/platform/web-girder/api/dataset.service.ts
+++ b/client/platform/web-girder/api/dataset.service.ts
@@ -3,7 +3,7 @@ import type { GirderModel } from '@girder/components/src';
 import {
   DatasetMetaMutable, FrameImage, SaveAttributeArgs, SaveAttributeTrackFilterArgs,
 } from 'dive-common/apispec';
-import { calibrationFileMarker } from 'dive-common/constants';
+import { calibrationFileMarker, jsonCalibrationFileMarker } from 'dive-common/constants';
 import { parentDatasetId } from 'dive-common/compositeDatasetId';
 import { isStereoCalibrationFileName } from 'dive-common/stereoParentFolder';
 import { GirderMetadataStatic } from 'platform/web-girder/constants';
@@ -220,7 +220,10 @@ function createMulticamDataset(args: CreateMulticamDatasetArgs) {
 }
 
 async function uploadCalibrationItem(parentFolderId: string, file: File): Promise<string> {
-  const calibrationMeta = { [calibrationFileMarker]: 'true' };
+  const isJson = file.name.toLowerCase().endsWith('.json');
+  const calibrationMeta = isJson
+    ? { [calibrationFileMarker]: 'true', [jsonCalibrationFileMarker]: 'true' }
+    : { [calibrationFileMarker]: 'true' };
   const itemResp = await girderRest.post<GirderModel>('/item', null, {
     params: {
       folderId: parentFolderId,
@@ -250,17 +253,18 @@ async function uploadCalibrationItem(parentFolderId: string, file: File): Promis
   return itemId;
 }
 
-function calibrationMarkerTruthy(meta: Record<string, unknown> | undefined): boolean {
-  const marker = meta?.[calibrationFileMarker];
+function calibrationMarkerTruthy(meta: Record<string, unknown> | undefined, key: string): boolean {
+  const marker = meta?.[key];
   return marker === true || marker === 'true' || marker === '1';
 }
 
 async function hasCalibrationFile(datasetId: string): Promise<boolean> {
   const parentId = parentDatasetId(datasetId);
   const folder = await girderRest.get<{
-    meta?: { multiCam?: { calibrationItemId?: string } };
+    meta?: { multiCam?: { calibrationItemId?: string; jsonCalibrationItemId?: string } };
   }>(`folder/${parentId}`);
-  if (folder.data.meta?.multiCam?.calibrationItemId) {
+  const multiCam = folder.data.meta?.multiCam;
+  if (multiCam?.calibrationItemId || multiCam?.jsonCalibrationItemId) {
     return true;
   }
   const items = await girderRest.get<Array<{ name: string; meta?: Record<string, unknown> }>>(
@@ -268,7 +272,10 @@ async function hasCalibrationFile(datasetId: string): Promise<boolean> {
     { params: { folderId: parentId, limit: 0 } },
   );
   return items.data.some(
-    (item) => calibrationMarkerTruthy(item.meta) && isStereoCalibrationFileName(item.name),
+    (item) => (
+      calibrationMarkerTruthy(item.meta, calibrationFileMarker)
+      || calibrationMarkerTruthy(item.meta, jsonCalibrationFileMarker)
+    ) && isStereoCalibrationFileName(item.name),
   );
 }
 
diff --git a/client/platform/web-girder/api/index.ts b/client/platform/web-girder/api/index.ts
index ce13b3f91..2f59dc56d 100644
--- a/client/platform/web-girder/api/index.ts
+++ b/client/platform/web-girder/api/index.ts
@@ -36,7 +36,7 @@ export function getUri(config: AxiosRequestConfig) {
   return girderRest.apiRoot.replace(/\/*$/i, '/') + girderRest.getUri(config).replace(/^\/*/, '');
 }
 
-/** Trigger a browser download of the dataset's current calibration file. */
+/** Trigger a browser download of the dataset's source calibration file. */
 export async function downloadCalibration(datasetId: string): Promise<void> {
   const { data } = await getDatasetCalibration(datasetId);
   if (data?.itemId) {
@@ -44,10 +44,15 @@ export async function downloadCalibration(datasetId: string): Promise<void> {
   }
 }
 
-/** Delete the Girder item holding the dataset's calibration file. */
+/** Delete the Girder items holding the dataset's calibration files. */
 export async function deleteCalibration(datasetId: string): Promise<void> {
   const { data } = await getDatasetCalibration(datasetId);
+  const itemIds = new Set<string>();
   if (data?.itemId) {
-    await deleteItem(data.itemId);
+    itemIds.add(data.itemId);
   }
+  if (data?.jsonItemId) {
+    itemIds.add(data.jsonItemId);
+  }
+  await Promise.all([...itemIds].map((itemId) => deleteItem(itemId)));
 }
diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index 51890f5d2..223c8ad46 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -33,6 +33,7 @@ def _clone_calibration_item(
     source_parent: types.GirderModel,
     cloned_parent: types.GirderModel,
     calibration_item_id: str,
+    marker: str,
 ) -> Optional[str]:
     """Copy a stereoscopic calibration item onto a cloned multicam parent folder."""
     cal_item = Item().load(calibration_item_id, level=AccessType.READ, user=owner)
@@ -41,10 +42,60 @@ def _clone_calibration_item(
     if str(cal_item.get('folderId')) != str(source_parent['_id']):
         return None
     copied = Item().copyItem(cal_item, creator=owner, folder=cloned_parent)
-    Item().setMetadata(copied, {constants.CalibrationFileMarker: 'true'})
+    Item().setMetadata(copied, {marker: 'true'})
     return str(copied['_id'])
 
 
+def _clone_calibration_items(
+    owner: types.GirderUserModel,
+    source_folder: types.GirderModel,
+    cloned_folder: types.GirderModel,
+    multi_cam: dict,
+) -> dict:
+    """Copy source and JSON calibration items onto a cloned multicam parent folder."""
+    updated = copy.deepcopy(multi_cam)
+    source_id = updated.get(constants.CalibrationItemIdMarker) or find_calibration_item_id(
+        str(source_folder['_id']), source_folder
+    )
+    json_id = updated.get(constants.JsonCalibrationItemIdMarker) or find_json_calibration_item_id(
+        str(source_folder['_id']), source_folder
+    )
+
+    new_source_id = None
+    new_json_id = None
+    if source_id:
+        new_source_id = _clone_calibration_item(
+            owner,
+            source_folder,
+            cloned_folder,
+            str(source_id),
+            constants.CalibrationFileMarker,
+        )
+    if json_id and str(json_id) != str(source_id):
+        new_json_id = _clone_calibration_item(
+            owner,
+            source_folder,
+            cloned_folder,
+            str(json_id),
+            constants.JsonCalibrationFileMarker,
+        )
+    elif json_id and json_id == source_id and new_source_id:
+        copied = Item().load(new_source_id, level=AccessType.WRITE, user=owner)
+        if copied is not None:
+            Item().setMetadata(copied, {constants.JsonCalibrationFileMarker: 'true'})
+            new_json_id = new_source_id
+
+    if new_source_id:
+        updated[constants.CalibrationItemIdMarker] = new_source_id
+    else:
+        updated.pop(constants.CalibrationItemIdMarker, None)
+    if new_json_id:
+        updated[constants.JsonCalibrationItemIdMarker] = new_json_id
+    else:
+        updated.pop(constants.JsonCalibrationItemIdMarker, None)
+    return updated
+
+
 def _create_multicam_soft_clone(
     owner: types.GirderUserModel,
     source_folder: types.GirderModel,
@@ -90,15 +141,9 @@ def _create_multicam_soft_clone(
 
     updated_multi_cam = copy.deepcopy(multi_cam)
     updated_multi_cam['cameras'] = new_cameras
-    calibration_item_id = updated_multi_cam.get(
-        constants.CalibrationItemIdMarker
-    ) or find_calibration_item_id(str(source_folder['_id']))
-    if calibration_item_id:
-        new_cal_id = _clone_calibration_item(
-            owner, source_folder, cloned_folder, calibration_item_id
-        )
-        if new_cal_id:
-            updated_multi_cam[constants.CalibrationItemIdMarker] = new_cal_id
+    updated_multi_cam = _clone_calibration_items(
+        owner, source_folder, cloned_folder, updated_multi_cam
+    )
     cloned_folder['meta'][constants.MultiCamMarker] = updated_multi_cam
     Folder().save(cloned_folder)
     crud_annotation.clone_annotations(source_folder, cloned_folder, owner, revision)
@@ -560,7 +605,21 @@ def _yield_calibration_files(
     folder_id: str,
 ) -> Generator[bytes, None, None]:
     """Add stereoscopic calibration files from a multicam parent folder root."""
-    for cal_item in _calibration_items_in_folder_root(folder_id):
+    seen_item_ids: set[str] = set()
+    for cal_item in _source_calibration_items_in_folder_root(folder_id):
+        item_id = str(cal_item['_id'])
+        if item_id in seen_item_ids:
+            continue
+        seen_item_ids.add(item_id)
+        for path, file in Item().fileList(cal_item):
+            for data in z.addFile(file, Path(f'{zip_path}{path}')):
+                yield data
+            break
+    for cal_item in _json_calibration_items_in_folder_root(folder_id):
+        item_id = str(cal_item['_id'])
+        if item_id in seen_item_ids:
+            continue
+        seen_item_ids.add(item_id)
         for path, file in Item().fileList(cal_item):
             for data in z.addFile(file, Path(f'{zip_path}{path}')):
                 yield data
@@ -863,33 +922,204 @@ def _mongo_id(value: str):
         return value
 
 
-def _item_has_calibration_marker(cal_item: dict) -> bool:
-    """True when the Girder item is marked as a stereoscopic calibration file."""
+def _item_has_source_calibration_marker(cal_item: dict) -> bool:
+    """True when the Girder item is the original calibration upload (calibrationFile)."""
     return asbool(cal_item.get('meta', {}).get(constants.CalibrationFileMarker))
 
 
-def _calibration_items_in_folder_root(folder_id: str):
+def _item_has_json_calibration_marker(cal_item: dict) -> bool:
+    """True when the Girder item holds the JSON camera-rig (jsonCalibrationFile)."""
+    meta = cal_item.get('meta') or {}
+    if asbool(meta.get(constants.JsonCalibrationFileMarker)):
+        return True
+    if asbool(meta.get(constants.CalibrationFileMarker)) and cal_item['name'].lower().endswith(
+        '.json'
+    ):
+        # Legacy datasets tagged the JSON item with calibrationFile only.
+        return True
+    return False
+
+
+def _multi_cam_meta(folder: Optional[types.GirderModel]) -> dict:
+    multi_cam = fromMeta(folder, constants.MultiCamMarker, default={}) if folder else {}
+    return multi_cam if isinstance(multi_cam, dict) else {}
+
+
+def _load_folder_calibration_meta(
+    folder_id: str,
+    folder: Optional[types.GirderModel],
+) -> dict:
+    multi_cam = _multi_cam_meta(folder)
+    if not multi_cam:
+        folder_doc = Folder().findOne({'_id': _mongo_id(folder_id)})
+        multi_cam = _multi_cam_meta(folder_doc)
+    return multi_cam
+
+
+def _source_calibration_items_in_folder_root(folder_id: str):
     """
-    Yield calibration file items stored in the dataset folder root.
+    Yield calibration source items stored in the dataset folder root.
 
     Camera media lives in child folders; only direct items on folder_id are considered.
-    Scans all folder items and matches meta.calibrationFile in Python so boolean/string
-    metadata values both work.
     """
     for cal_item in Item().find({'folderId': _mongo_id(folder_id)}, sort=[('created', -1)]):
-        if _item_has_calibration_marker(cal_item) and constants.stereoCalibrationRegex.search(
+        if _item_has_source_calibration_marker(cal_item) and constants.stereoCalibrationRegex.search(
             cal_item['name']
         ):
             yield cal_item
 
 
-def find_calibration_item_id(folder_id: str) -> Optional[str]:
-    """Return the most recent marked calibration file item in the dataset folder root."""
-    for cal_item in _calibration_items_in_folder_root(folder_id):
+def _json_calibration_items_in_folder_root(folder_id: str):
+    """Yield items marked with meta.jsonCalibrationFile (JSON camera-rig)."""
+    for cal_item in Item().find({'folderId': _mongo_id(folder_id)}, sort=[('created', -1)]):
+        if _item_has_json_calibration_marker(cal_item):
+            yield cal_item
+
+
+def find_calibration_item_id(
+    folder_id: str,
+    folder: Optional[types.GirderModel] = None,
+) -> Optional[str]:
+    """Return the calibrationFile item id used for pipeline input."""
+    multi_cam = _load_folder_calibration_meta(folder_id, folder)
+
+    cached_id = multi_cam.get(constants.CalibrationItemIdMarker)
+    if cached_id:
+        cal_item = Item().findOne({'_id': _mongo_id(str(cached_id))})
+        if cal_item is not None and str(cal_item.get('folderId')) == folder_id:
+            if not _item_has_source_calibration_marker(cal_item):
+                Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
+            return str(cached_id)
+
+    for cal_item in _source_calibration_items_in_folder_root(folder_id):
         return str(cal_item['_id'])
     return None
 
 
+def find_json_calibration_item_id(
+    folder_id: str,
+    folder: Optional[types.GirderModel] = None,
+) -> Optional[str]:
+    """Return the jsonCalibrationFile item id used for calibration display."""
+    multi_cam = _load_folder_calibration_meta(folder_id, folder)
+    source_id = find_calibration_item_id(folder_id, folder)
+
+    cached_id = multi_cam.get(constants.JsonCalibrationItemIdMarker)
+    if cached_id:
+        cal_item = Item().findOne({'_id': _mongo_id(str(cached_id))})
+        if cal_item is not None and str(cal_item.get('folderId')) == folder_id:
+            if not _item_has_json_calibration_marker(cal_item):
+                Item().setMetadata(cal_item, {constants.JsonCalibrationFileMarker: 'true'})
+            return str(cached_id)
+
+    for cal_item in _json_calibration_items_in_folder_root(folder_id):
+        item_id = str(cal_item['_id'])
+        if source_id and item_id == source_id and not cal_item['name'].lower().endswith('.json'):
+            continue
+        return item_id
+
+    # Legacy: JSON may still be attached to the source calibration item.
+    if source_id:
+        source_item = Item().findOne({'_id': _mongo_id(source_id)})
+        if source_item is not None:
+            files = list(Item().childFiles(source_item))
+            if any(f['name'].lower().endswith('.json') for f in files):
+                return source_id
+    return None
+
+
+def _clear_prior_calibration_items(
+    folder_id: str,
+    *,
+    keep_source_item_id: Optional[str] = None,
+) -> None:
+    """Remove prior calibration items when replacing the dataset calibration."""
+    for prior in _json_calibration_items_in_folder_root(folder_id):
+        if keep_source_item_id and str(prior['_id']) == keep_source_item_id:
+            continue
+        Item().remove(prior)
+    for prior in _source_calibration_items_in_folder_root(folder_id):
+        if keep_source_item_id and str(prior['_id']) == keep_source_item_id:
+            continue
+        Item().setMetadata(prior, {constants.CalibrationFileMarker: False})
+
+
+def _mark_calibration_source_item(cal_item: dict) -> None:
+    Item().setMetadata(
+        cal_item,
+        {
+            constants.CalibrationFileMarker: 'true',
+            constants.JsonCalibrationFileMarker: False,
+        },
+    )
+
+
+def _mark_calibration_source_and_json_item(cal_item: dict) -> None:
+    """JSON uploads serve as both the source file and the JSON camera-rig."""
+    Item().setMetadata(
+        cal_item,
+        {
+            constants.CalibrationFileMarker: 'true',
+            constants.JsonCalibrationFileMarker: 'true',
+        },
+    )
+
+
+def _parse_stereo_calibration_json(data: dict) -> types.DatasetStereoCalibration:
+    calib_left = types.CameraCalibration(
+        cx=data['cx_left'],
+        cy=data['cy_left'],
+        fx=data['fx_left'],
+        fy=data['fy_left'],
+        k1=data['k1_left'],
+        k2=data['k2_left'],
+        k3=data['k3_left'],
+        p1=data['p1_left'],
+        p2=data['p2_left'],
+        rmsError=data['rms_error_left'],
+    )
+    calib_right = types.CameraCalibration(
+        cx=data['cx_right'],
+        cy=data['cy_right'],
+        fx=data['fx_right'],
+        fy=data['fy_right'],
+        k1=data['k1_right'],
+        k2=data['k2_right'],
+        k3=data['k3_right'],
+        p1=data['p1_right'],
+        p2=data['p2_right'],
+        rmsError=data['rms_error_right'],
+    )
+    return types.DatasetStereoCalibration(
+        R=data['R'],
+        T=data['T'],
+        gridHeight=data['grid_height'],
+        gridWidth=data['grid_width'],
+        imageHeight=data['image_height'],
+        imageWidth=data['image_width'],
+        squareSize=data['square_size_mm'],
+        rmsError=data['rms_error_stereo'],
+        calibrations={'left': calib_left, 'right': calib_right},
+    )
+
+
+def _read_json_calibration_file(
+    json_file: dict,
+) -> Optional[types.DatasetStereoCalibration]:
+    try:
+        with File().open(json_file) as fh:
+            chunks = []
+            while True:
+                chunk = fh.read(4096)
+                if not chunk:
+                    break
+                chunks.append(chunk)
+        data = json.loads(b"".join(chunks).decode("utf-8"))
+        return _parse_stereo_calibration_json(data)
+    except (ValueError, KeyError, TypeError, UnicodeDecodeError):
+        return None
+
+
 def pipeline_requires_calibration(pipeline: types.PipelineDescription) -> bool:
     """True when pipeline metadata (or legacy measurement type) requires calibration input."""
     metadata = pipeline.get('metadata') or {}
@@ -912,7 +1142,7 @@ def resolve_stereo_calibration_item_id(
         return None
 
     folder_id = str(parent_folder['_id'])
-    item_id = find_calibration_item_id(folder_id)
+    item_id = find_calibration_item_id(folder_id, parent_folder)
     if item_id is not None:
         return item_id
 
@@ -930,7 +1160,7 @@ def resolve_stereo_calibration_item_id(
         return None
     if not constants.stereoCalibrationRegex.search(cal_item['name']):
         return None
-    if not _item_has_calibration_marker(cal_item):
+    if not _item_has_source_calibration_marker(cal_item):
         Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
     return str(cal_item['_id'])
 
@@ -1047,7 +1277,8 @@ def create_multicam(
             'type': validated.type,
         }
 
-    calibration_item_id = None
+    calibration_source_item_id = None
+    json_calibration_item_id = None
     if validated.calibrationFileId:
         if validated.subType != 'stereo':
             raise RestException('Calibration is only supported for stereo datasets', code=400)
@@ -1064,10 +1295,13 @@ def create_multicam(
                 'Calibration file must be .npz, .json, .cam, .yml, or .zip',
                 code=400,
             )
-        Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
-        calibration_item_id = str(cal_item['_id'])
-        if not cal_item['name'].lower().endswith('.json'):
-            enqueue_calibration_conversion(user, calibration_item_id, cal_item['name'])
+        calibration_source_item_id = str(cal_item['_id'])
+        if cal_item['name'].lower().endswith('.json'):
+            _mark_calibration_source_and_json_item(cal_item)
+            json_calibration_item_id = calibration_source_item_id
+        else:
+            _mark_calibration_source_item(cal_item)
+            enqueue_calibration_conversion(user, calibration_source_item_id, cal_item['name'])
 
     parent_folder_doc['meta'] = {
         constants.DatasetMarker: True,
@@ -1079,8 +1313,18 @@ def create_multicam(
             'cameraOrder': camera_order,
             'cameras': multi_cam_cameras,
             **(
-                {constants.CalibrationItemIdMarker: calibration_item_id}
-                if calibration_item_id
+                {constants.CalibrationItemIdMarker: calibration_source_item_id}
+                if calibration_source_item_id
+                else {}
+            ),
+            **(
+                {constants.JsonCalibrationItemIdMarker: json_calibration_item_id}
+                if json_calibration_item_id
+                else {}
+            ),
+            **(
+                {constants.CalibrationOriginalNameMarker: cal_item['name']}
+                if calibration_source_item_id
                 else {}
             ),
         },
@@ -1157,83 +1401,49 @@ def get_calibration(
             'Cannot search for calibration file on non stereo/multicam datasets', code=400
         )
 
-    calibration_item_id = find_calibration_item_id(folder_id_str)
-    if calibration_item_id is None:
+    source_item_id = find_calibration_item_id(folder_id_str, folder)
+    json_item_id = find_json_calibration_item_id(folder_id_str, folder)
+    if source_item_id is None and json_item_id is None:
         return None
 
-    calibration_item = Item().load(calibration_item_id, level=AccessType.READ, user=user)
-
-    files = list(Item().childFiles(calibration_item))
-    json_file = next((f for f in files if f['name'].endswith('.json')), None)
-    # File name reported even when parameters can't be parsed (e.g. an .npz or an
-    # unsupported/corrupt file) so the viewer still shows the calibration as loaded.
-    fallback = json_file or (files[0] if files else None) or calibration_item
-    fallback_name = fallback['name']
-
-    if json_file is not None:
-        try:
-            with File().open(json_file) as fh:
-                chunks = []
-                while True:
-                    chunk = fh.read(4096)
-                    if not chunk:
-                        break
-                    chunks.append(chunk)
-
-            data = json.loads(b"".join(chunks).decode("utf-8"))
-
-            calib_left = types.CameraCalibration(
-                cx=data['cx_left'],
-                cy=data['cy_left'],
-                fx=data['fx_left'],
-                fy=data['fy_left'],
-                k1=data['k1_left'],
-                k2=data['k2_left'],
-                k3=data['k3_left'],
-                p1=data['p1_left'],
-                p2=data['p2_left'],
-                rmsError=data['rms_error_left'],
-            )
-
-            calib_right = types.CameraCalibration(
-                cx=data['cx_right'],
-                cy=data['cy_right'],
-                fx=data['fx_right'],
-                fy=data['fy_right'],
-                k1=data['k1_right'],
-                k2=data['k2_right'],
-                k3=data['k3_right'],
-                p1=data['p1_right'],
-                p2=data['p2_right'],
-                rmsError=data['rms_error_right'],
-            )
-
-            dataset_calibration = types.DatasetStereoCalibration(
-                R=data['R'],
-                T=data['T'],
-                gridHeight=data['grid_height'],
-                gridWidth=data['grid_width'],
-                imageHeight=data['image_height'],
-                imageWidth=data['image_width'],
-                squareSize=data['square_size_mm'],
-                rmsError=data['rms_error_stereo'],
-                calibrations={'left': calib_left, 'right': calib_right},
+    multi_cam = _multi_cam_meta(folder)
+    source_name = multi_cam.get(constants.CalibrationOriginalNameMarker)
+    if source_item_id and not source_name:
+        source_item = Item().load(source_item_id, level=AccessType.READ, user=user)
+        if source_item is not None:
+            source_name = source_item['name']
+
+    json_path = None
+    json_file_model = None
+    if json_item_id:
+        json_item = Item().load(json_item_id, level=AccessType.READ, user=user)
+        if json_item is not None:
+            json_files = list(Item().childFiles(json_item))
+            json_file_model = next(
+                (f for f in json_files if f['name'].lower().endswith('.json')),
+                json_files[0] if json_files else None,
             )
+            if json_file_model is not None:
+                json_path = json_file_model['name']
 
+    if json_file_model is not None:
+        dataset_calibration = _read_json_calibration_file(json_file_model)
+        if dataset_calibration is not None:
             return types.DatasetCalibrationResult(
                 calibration=dataset_calibration,
-                itemId=str(calibration_item['_id']),
-                path=json_file['name'],
+                itemId=source_item_id,
+                jsonItemId=json_item_id,
+                originalName=source_name,
+                jsonPath=json_path,
+                path=json_path,
             )
-        except (ValueError, KeyError, UnicodeDecodeError):
-            # Present-but-unparseable JSON: fall through to a filename-only result.
-            pass
 
-    # A calibration file is attached but its parameters can't be parsed (non-JSON
-    # such as .npz, or malformed). Report its presence and name.
     return types.DatasetCalibrationResult(
-        itemId=str(calibration_item['_id']),
-        path=fallback_name,
+        itemId=source_item_id,
+        jsonItemId=json_item_id,
+        originalName=source_name,
+        jsonPath=json_path,
+        path=json_path,
     )
 
 
@@ -1243,9 +1453,8 @@ def enqueue_calibration_conversion(
     item_name: str,
 ) -> None:
     """
-    Kick off a background worker job to convert a non-JSON calibration file to the
-    JSON camera-rig format (for display). The pipeline can consume the original file
-    directly, so this is best-effort and never blocks the request.
+    Kick off a background worker job to convert a calibrationFile item to a separate
+    jsonCalibrationFile JSON camera-rig item for display.
     """
     job_is_private = user.get(constants.UserPrivateQueueEnabledMarker, False)
     # convert_cam_format.py lives on pipeline workers (VIAME image), not celery workers.
@@ -1289,20 +1498,25 @@ def set_calibration(
     if cal_item is None or str(cal_item.get('folderId')) != str(folder['_id']):
         raise RestException('Calibration file must be stored in the dataset folder', code=400)
 
-    # Unmark any prior calibration items so find_calibration_item_id picks the new one.
-    for prior in _calibration_items_in_folder_root(str(folder['_id'])):
-        if str(prior['_id']) != str(cal_item['_id']):
-            Item().setMetadata(prior, {constants.CalibrationFileMarker: False})
-
-    Item().setMetadata(cal_item, {constants.CalibrationFileMarker: 'true'})
+    folder_id = str(folder['_id'])
+    _clear_prior_calibration_items(folder_id, keep_source_item_id=str(cal_item['_id']))
 
     multi_cam = dict(folder['meta'].get(constants.MultiCamMarker, {}))
     multi_cam[constants.CalibrationItemIdMarker] = str(cal_item['_id'])
-    folder['meta'][constants.MultiCamMarker] = multi_cam
-    Folder().save(folder)
+    multi_cam[constants.CalibrationOriginalNameMarker] = file['name']
+    multi_cam.pop(constants.JsonCalibrationItemIdMarker, None)
 
-    # Non-JSON formats (e.g. .npz) need conversion before parameters can be displayed.
-    if not file['name'].lower().endswith('.json'):
+    if file['name'].lower().endswith('.json'):
+        _mark_calibration_source_and_json_item(cal_item)
+        multi_cam[constants.JsonCalibrationItemIdMarker] = str(cal_item['_id'])
+    else:
+        _mark_calibration_source_item(cal_item)
         enqueue_calibration_conversion(user, str(cal_item['_id']), cal_item['name'])
 
-    return {'calibrationItemId': str(cal_item['_id'])}
+    folder['meta'][constants.MultiCamMarker] = multi_cam
+    Folder().save(folder)
+
+    return {
+        'calibrationItemId': str(cal_item['_id']),
+        'jsonCalibrationItemId': multi_cam.get(constants.JsonCalibrationItemIdMarker),
+    }
diff --git a/server/dive_tasks/tasks.py b/server/dive_tasks/tasks.py
index 439d72aae..433d29826 100644
--- a/server/dive_tasks/tasks.py
+++ b/server/dive_tasks/tasks.py
@@ -27,7 +27,7 @@
     is_stereo_measurement_pipeline,
 )
 from dive_tasks.pipeline_discovery import discover_configs
-from dive_utils import constants, fromMeta
+from dive_utils import asbool, constants, fromMeta
 from dive_utils.types import (
     AvailableJobSchema,
     ExportTrainedPipelineJob,
@@ -724,10 +724,8 @@ def train_pipeline(self: Task, params: TrainingJob):
 @app.task(bind=True, acks_late=True, ignore_result=True)
 def convert_calibration(self: Task, itemId: str):
     """
-    Convert a stereoscopic calibration file (npz/yml/mat/cam/zip) stored in a Girder
-    item to the KWIVER JSON camera-rig format, uploading the JSON into the same item
-    so the viewer can display calibration parameters. No-op when the item already has
-    a .json camera-rig.
+    Convert a calibrationFile item to a JSON camera-rig in a separate Girder item
+    marked jsonCalibrationFile for display.
     """
     conf = Config()
     conf.require_viame_install()
@@ -743,12 +741,14 @@ def convert_calibration(self: Task, itemId: str):
     with tempfile.TemporaryDirectory() as _working_directory, suppress(utils.CanceledError):
         _working_directory_path = Path(_working_directory)
         item: GirderModel = gc.getItem(itemId)
-        files = list(gc.listFile(itemId))
-
-        if any(f['name'].lower().endswith('.json') for f in files):
-            manager.write('Calibration item already has a JSON camera-rig; skipping.\n')
+        folder_id = str(item.get('folderId'))
+        folder = gc.getFolder(folder_id)
+        multi_cam = (folder.get('meta') or {}).get(constants.MultiCamMarker) or {}
+        if multi_cam.get(constants.JsonCalibrationItemIdMarker):
+            manager.write('Calibration JSON item already linked; skipping.\n')
             return
 
+        files = list(gc.listFile(itemId))
         source_file = next(
             (f for f in files if constants.stereoCalibrationRegex.search(f['name'])),
             None,
@@ -756,6 +756,9 @@ def convert_calibration(self: Task, itemId: str):
         if source_file is None:
             manager.write('No convertible calibration file found in item; skipping.\n')
             return
+        if source_file['name'].lower().endswith('.json'):
+            manager.write('Source calibration is already JSON; skipping conversion.\n')
+            return
 
         manager.updateStatus(JobStatus.FETCHING_INPUT)
         gc.downloadItem(itemId, _working_directory_path, name=item.get('name'))
@@ -783,7 +786,43 @@ def convert_calibration(self: Task, itemId: str):
             raise RuntimeError('Calibration conversion produced no JSON output')
 
         manager.updateStatus(JobStatus.PUSHING_OUTPUT)
-        gc.uploadFileToItem(itemId, str(output_path))
+        json_name = output_path.name
+        gc.upload(str(output_path), folder_id)
+        json_items = sorted(
+            gc.listItem(folder_id, name=json_name),
+            key=lambda existing: existing.get('created', ''),
+        )
+        if not json_items:
+            raise RuntimeError('Failed to create calibration JSON item')
+        json_item = json_items[-1]
+        json_item_id = str(json_item['_id'])
+        gc.addMetadataToItem(
+            json_item_id,
+            {
+                constants.JsonCalibrationFileMarker: 'true',
+                constants.CalibrationFileMarker: False,
+            },
+        )
+
+        updated_multi_cam = dict(multi_cam)
+        updated_multi_cam.setdefault(constants.CalibrationItemIdMarker, str(itemId))
+        updated_multi_cam[constants.JsonCalibrationItemIdMarker] = json_item_id
+        updated_multi_cam.setdefault(
+            constants.CalibrationOriginalNameMarker,
+            source_file['name'],
+        )
+        gc.addMetadataToFolder(
+            folder_id,
+            {constants.MultiCamMarker: updated_multi_cam},
+        )
+
+        for existing_item in gc.listItem(folder_id):
+            existing_id = str(existing_item['_id'])
+            if existing_id in {json_item_id, str(itemId)}:
+                continue
+            existing_meta = existing_item.get('meta') or {}
+            if asbool(existing_meta.get(constants.JsonCalibrationFileMarker)):
+                gc.delete(f"item/{existing_id}")
 
 
 @app.task(bind=True, acks_late=True, ignore_result=True)
diff --git a/server/dive_utils/constants.py b/server/dive_utils/constants.py
index b4fdf7d3d..916d373cf 100644
--- a/server/dive_utils/constants.py
+++ b/server/dive_utils/constants.py
@@ -113,8 +113,12 @@
 SubTypeMarker = "subType"
 MultiCamMarker = "multiCam"
 CalibrationItemIdMarker = "calibrationItemId"
-# Girder item meta: marks stereoscopic calibration files in the dataset base folder
+JsonCalibrationItemIdMarker = "jsonCalibrationItemId"
+CalibrationOriginalNameMarker = "calibrationOriginalName"
+# Girder item meta: original stereoscopic calibration upload (npz, yml, etc.)
 CalibrationFileMarker = "calibrationFile"
+# Girder item meta: JSON camera-rig used for calibration display
+JsonCalibrationFileMarker = "jsonCalibrationFile"
 AssetstoreSourceMarker = "import_source"
 AssetstoreSourcePathMarker = "import_path"
 MarkForPostProcess = "MarkForPostProcess"
diff --git a/server/dive_utils/models.py b/server/dive_utils/models.py
index d82e68066..6f500207b 100644
--- a/server/dive_utils/models.py
+++ b/server/dive_utils/models.py
@@ -275,6 +275,8 @@ class MultiCamMetaStorage(BaseModel):
     cameras: Dict[str, MultiCamCameraMeta]
     cameraOrder: List[str] = Field(default_factory=list)
     calibrationItemId: Optional[str] = None
+    jsonCalibrationItemId: Optional[str] = None
+    calibrationOriginalName: Optional[str] = None
 
 
 class MultiCamMediaCamera(BaseModel):
diff --git a/server/dive_utils/types.py b/server/dive_utils/types.py
index 70627137e..496e928e8 100644
--- a/server/dive_utils/types.py
+++ b/server/dive_utils/types.py
@@ -209,10 +209,13 @@ class DatasetStereoCalibration(TypedDict):
 
 class DatasetCalibrationResult(TypedDict):
     # `calibration` is absent when the stored file isn't a parseable JSON
-    # camera-rig (e.g. an .npz); the file name is still reported via `path`.
+    # camera-rig (e.g. an .npz); the file name is still reported via `jsonPath`.
     calibration: NotRequired[DatasetStereoCalibration]
-    itemId: str
-    path: str
+    itemId: NotRequired[str]
+    jsonItemId: NotRequired[str]
+    originalName: NotRequired[str]
+    jsonPath: NotRequired[str]
+    path: NotRequired[str]
 
 
 # Attribute metadata discovered while deserializing annotations, keyed by attribute name.
diff --git a/server/tests/test_create_multicam.py b/server/tests/test_create_multicam.py
index 4d762f513..b454dd39d 100644
--- a/server/tests/test_create_multicam.py
+++ b/server/tests/test_create_multicam.py
@@ -213,17 +213,28 @@ def test_create_multicam_marks_calibration_in_dataset_folder(
     item_cls.return_value.move.assert_not_called()
     item_cls.return_value.setMetadata.assert_called_once_with(
         cal_item,
-        {constants.CalibrationFileMarker: 'true'},
+        {
+            constants.CalibrationFileMarker: 'true',
+            constants.JsonCalibrationFileMarker: 'true',
+        },
     )
     saved_meta = folder_cls.return_value.save.call_args_list[-1][0][0]['meta']
-    assert saved_meta[constants.MultiCamMarker][constants.CalibrationItemIdMarker] == 'cal-id'
+    multi_cam = saved_meta[constants.MultiCamMarker]
+    assert multi_cam[constants.CalibrationItemIdMarker] == 'cal-id'
+    assert multi_cam[constants.JsonCalibrationItemIdMarker] == 'cal-id'
+    assert multi_cam[constants.CalibrationOriginalNameMarker] == 'stereo-cal.json'
 
 
 @patch('dive_server.crud_dataset.Item')
 def test_resolve_stereo_calibration_item_id_from_folder_root(item_cls):
     parent_folder = {
         '_id': 'multi-id',
-        'meta': {constants.SubTypeMarker: 'stereo'},
+        'meta': {
+            constants.SubTypeMarker: 'stereo',
+            constants.MultiCamMarker: {
+                constants.CalibrationItemIdMarker: 'cal-id',
+            },
+        },
     }
     pipeline = {
         'name': 'Stereo',
@@ -237,17 +248,11 @@ def test_resolve_stereo_calibration_item_id_from_folder_root(item_cls):
         'meta': {constants.CalibrationFileMarker: 'true'},
     }
 
-    item_cls.return_value.find.return_value = [cal_item]
+    item_cls.return_value.findOne.return_value = cal_item
 
     result = crud_dataset.resolve_stereo_calibration_item_id(parent_folder, pipeline)
 
     assert result == 'cal-id'
-    item_cls.return_value.find.assert_called_once()
-    from dive_server.crud_dataset import _mongo_id
-
-    assert item_cls.return_value.find.call_args[0][0] == {
-        'folderId': _mongo_id('multi-id'),
-    }
 
 
 @patch('dive_server.crud_dataset.Item')
diff --git a/server/tests/test_multicam_export_clone.py b/server/tests/test_multicam_export_clone.py
index 226b567bc..21af2c7a7 100644
--- a/server/tests/test_multicam_export_clone.py
+++ b/server/tests/test_multicam_export_clone.py
@@ -48,13 +48,14 @@ def _child_folder(folder_id: str, name: str):
     }
 
 
+@patch('dive_server.crud_dataset.find_json_calibration_item_id', return_value=None)
 @patch('dive_server.crud_dataset.find_calibration_item_id', return_value=None)
 @patch('dive_server.crud_dataset.crud_annotation.clone_annotations')
 @patch('dive_server.crud_dataset.crud.get_or_create_auxiliary_folder')
 @patch('dive_server.crud_dataset._create_single_camera_soft_clone')
 @patch('dive_server.crud_dataset.Folder')
 def test_create_multicam_soft_clone_rewrites_camera_folder_ids(
-    folder_cls, create_soft_clone_mock, _aux, _clone_ann, _find_cal
+    folder_cls, create_soft_clone_mock, _aux, _clone_ann, _find_cal, _find_json_cal
 ):
     owner = {'login': 'tester'}
     source = _multi_parent_folder()
@@ -86,8 +87,7 @@ def load_folder(folder_id, level=None, user=None):
     assert cameras['right']['folderId'] == 'clone-right-id'
 
 
-@patch('dive_server.crud_dataset._clone_calibration_item')
-@patch('dive_server.crud_dataset.find_calibration_item_id')
+@patch('dive_server.crud_dataset._clone_calibration_items')
 @patch('dive_server.crud_dataset.crud_annotation.clone_annotations')
 @patch('dive_server.crud_dataset.crud.get_or_create_auxiliary_folder')
 @patch('dive_server.crud_dataset._create_single_camera_soft_clone')
@@ -97,12 +97,12 @@ def test_create_multicam_soft_clone_copies_calibration(
     create_soft_clone_mock,
     _aux,
     _clone_ann,
-    find_cal_mock,
-    clone_cal_mock,
+    clone_cals_mock,
 ):
     owner = {'login': 'tester'}
     source = _multi_parent_folder()
-    source['meta'][constants.MultiCamMarker][constants.CalibrationItemIdMarker] = 'cal-id'
+    source['meta'][constants.MultiCamMarker][constants.CalibrationItemIdMarker] = 'cal-src'
+    source['meta'][constants.MultiCamMarker][constants.JsonCalibrationItemIdMarker] = 'cal-json'
     parent = {'_id': 'dest-parent'}
     left = _child_folder('left-id', 'left')
     right = _child_folder('right-id', 'right')
@@ -118,13 +118,18 @@ def test_create_multicam_soft_clone_copies_calibration(
         {**left, '_id': 'clone-left-id'},
         {**right, '_id': 'clone-right-id'},
     ]
-    clone_cal_mock.return_value = 'new-cal-id'
+    clone_cals_mock.side_effect = lambda _owner, _source, _cloned, multi_cam: {
+        **multi_cam,
+        constants.CalibrationItemIdMarker: 'new-cal-src',
+        constants.JsonCalibrationItemIdMarker: 'new-cal-json',
+    }
 
     crud_dataset.createSoftClone(owner, source, parent, 'Clone stereo', None)
 
-    clone_cal_mock.assert_called_once()
+    clone_cals_mock.assert_called_once()
     saved_meta = folder_cls.return_value.save.call_args_list[-1][0][0]['meta']
-    assert saved_meta[constants.MultiCamMarker][constants.CalibrationItemIdMarker] == 'new-cal-id'
+    assert saved_meta[constants.MultiCamMarker][constants.CalibrationItemIdMarker] == 'new-cal-src'
+    assert saved_meta[constants.MultiCamMarker][constants.JsonCalibrationItemIdMarker] == 'new-cal-json'
 
 
 @patch('dive_server.crud_dataset._yield_single_dataset_export')

From f3c4ab0691a8c97d043f9ecff90312ba9afd7144 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 16:46:09 -0400
Subject: [PATCH 24/25] handle calibration json files with missing parameters

---
 client/dive-common/apispec.ts                 |  32 +++---
 .../components/CalibrationDialog.vue          | 105 +++++++++++++++---
 .../platform/desktop/backend/native/common.ts |  78 +++++++++----
 server/dive_server/crud_dataset.py            |  82 ++++++++------
 server/dive_utils/types.py                    |  14 +--
 5 files changed, 219 insertions(+), 92 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index 956215343..45d0abb14 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -201,27 +201,27 @@ interface DatasetMeta extends DatasetMetaMutable {
 }
 
 interface CameraCalibration {
-  cx: number
-  cy: number
-  fx: number
-  fy: number
-  k1: number
-  k2: number
-  k3: number
-  p1: number
-  p2: number
-  rmsError: number
+  cx?: number
+  cy?: number
+  fx?: number
+  fy?: number
+  k1?: number
+  k2?: number
+  k3?: number
+  p1?: number
+  p2?: number
+  rmsError?: number
 }
 
 interface DatasetStereoCalibration {
   R: number[]
   T: number[]
-  gridHeight: number
-  gridWidth: number
-  imageHeight: number
-  imageWidth: number
-  squareSize: number
-  rmsError: number
+  gridHeight?: number
+  gridWidth?: number
+  imageHeight?: number
+  imageWidth?: number
+  squareSize?: number
+  rmsError?: number
   calibrations: Record<string, CameraCalibration>
 }
 
diff --git a/client/dive-common/components/CalibrationDialog.vue b/client/dive-common/components/CalibrationDialog.vue
index 15dd97e66..80ea05c5e 100644
--- a/client/dive-common/components/CalibrationDialog.vue
+++ b/client/dive-common/components/CalibrationDialog.vue
@@ -18,6 +18,73 @@ export default defineComponent({
   setup(props, { emit }) {
     const close = () => emit('input', false);
 
+    const formatOptional = (value: number | undefined) => (
+      value === undefined || value === null ? '' : String(value)
+    );
+
+    const formatPair = (first: number | undefined, second: number | undefined) => {
+      const formattedFirst = formatOptional(first);
+      const formattedSecond = formatOptional(second);
+      if (!formattedFirst && !formattedSecond) {
+        return '';
+      }
+      return `${formattedFirst} , ${formattedSecond}`;
+    };
+
+    const formatTriple = (
+      first: number | undefined,
+      second: number | undefined,
+      third: number | undefined,
+    ) => {
+      const formattedFirst = formatOptional(first);
+      const formattedSecond = formatOptional(second);
+      const formattedThird = formatOptional(third);
+      if (!formattedFirst && !formattedSecond && !formattedThird) {
+        return '';
+      }
+      return `${formattedFirst} , ${formattedSecond} , ${formattedThird}`;
+    };
+
+    const formatResolution = (
+      width: number | undefined,
+      height: number | undefined,
+    ) => {
+      const formattedWidth = formatOptional(width);
+      const formattedHeight = formatOptional(height);
+      if (!formattedWidth && !formattedHeight) {
+        return '';
+      }
+      return `${formattedWidth} x ${formattedHeight} px`;
+    };
+
+    const formatGrid = (width: number | undefined, height: number | undefined) => {
+      const formattedWidth = formatOptional(width);
+      const formattedHeight = formatOptional(height);
+      if (!formattedWidth && !formattedHeight) {
+        return '';
+      }
+      return `${formattedWidth} x ${formattedHeight}`;
+    };
+
+    const formatWithUnit = (value: number | undefined, unit: string) => {
+      const formatted = formatOptional(value);
+      return formatted ? `${formatted} ${unit}` : '';
+    };
+
+    const formatRotationRow = (rotation: number[] | undefined, start: number) => {
+      if (!rotation || rotation.length < start + 3) {
+        return '';
+      }
+      return `[${rotation[start].toFixed(4)}, ${rotation[start + 1].toFixed(4)}, ${rotation[start + 2].toFixed(4)}]`;
+    };
+
+    const formatTranslation = (translation: number[] | undefined, index: number) => {
+      if (!translation || translation.length <= index) {
+        return '';
+      }
+      return String(translation[index]);
+    };
+
     const downloadCalibration = () => {
       emit('download');
       close();
@@ -31,6 +98,14 @@ export default defineComponent({
       close,
       downloadCalibration,
       deleteCalibration,
+      formatOptional,
+      formatPair,
+      formatTriple,
+      formatResolution,
+      formatGrid,
+      formatWithUnit,
+      formatRotationRow,
+      formatTranslation,
     };
   },
 });
@@ -85,10 +160,10 @@ export default defineComponent({
                 </tr>
               </thead>
               <tbody>
-                <tr><td>Image resolution</td><td>{{ calibration.imageWidth }} x {{ calibration.imageHeight }} px</td></tr>
-                <tr><td>Calibration grid</td><td>{{ calibration.gridWidth }} x {{ calibration.gridHeight }}</td></tr>
-                <tr><td>Square size</td><td>{{ calibration.squareSize }} mm</td></tr>
-                <tr><td>Stereo RMS Error</td><td>{{ calibration.rmsError }}</td></tr>
+                <tr><td>Image resolution</td><td>{{ formatResolution(calibration.imageWidth, calibration.imageHeight) }}</td></tr>
+                <tr><td>Calibration grid</td><td>{{ formatGrid(calibration.gridWidth, calibration.gridHeight) }}</td></tr>
+                <tr><td>Square size</td><td>{{ formatWithUnit(calibration.squareSize, 'mm') }}</td></tr>
+                <tr><td>Stereo RMS Error</td><td>{{ formatOptional(calibration.rmsError) }}</td></tr>
               </tbody>
             </template>
           </v-simple-table>
@@ -112,31 +187,31 @@ export default defineComponent({
                 <tr>
                   <td><strong>Focal (fx, fy)</strong></td>
                   <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
-                    {{ calib.fx }} , {{ calib.fy }}
+                    {{ formatPair(calib.fx, calib.fy) }}
                   </td>
                 </tr>
                 <tr>
                   <td><strong>Optical center (cx, cy)</strong></td>
                   <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
-                    {{ calib.cx }} , {{ calib.cy }}
+                    {{ formatPair(calib.cx, calib.cy) }}
                   </td>
                 </tr>
                 <tr>
                   <td><strong>Radial Distortion (k1, k2, k3)</strong></td>
                   <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
-                    {{ calib.k1 }} , {{ calib.k2 }} , {{ calib.k3 }}
+                    {{ formatTriple(calib.k1, calib.k2, calib.k3) }}
                   </td>
                 </tr>
                 <tr>
                   <td><strong>Tangential Distortion (p1, p2)</strong></td>
                   <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
-                    {{ calib.p1 }} , {{ calib.p2 }}
+                    {{ formatPair(calib.p1, calib.p2) }}
                   </td>
                 </tr>
                 <tr>
                   <td><strong>RMS Error</strong></td>
                   <td v-for="(calib, cameraName) in calibration.calibrations" :key="cameraName">
-                    {{ calib.rmsError }}
+                    {{ formatOptional(calib.rmsError) }}
                   </td>
                 </tr>
               </tbody>
@@ -152,9 +227,9 @@ export default defineComponent({
                 <div class="font-weight-bold mb-1">
                   Translation T (mm):
                 </div>
-                X: {{ calibration.T[0] }}<br>
-                Y: {{ calibration.T[1] }}<br>
-                Z: {{ calibration.T[2] }}
+                X: {{ formatTranslation(calibration.T, 0) }}<br>
+                Y: {{ formatTranslation(calibration.T, 1) }}<br>
+                Z: {{ formatTranslation(calibration.T, 2) }}
               </v-card>
             </v-col>
             <v-col cols="12" md="6">
@@ -162,9 +237,9 @@ export default defineComponent({
                 <div class="font-weight-bold mb-1">
                   Rotation R:
                 </div>
-                [{{ calibration.R[0].toFixed(4) }}, {{ calibration.R[1].toFixed(4) }}, {{ calibration.R[2].toFixed(4) }}]<br>
-                [{{ calibration.R[3].toFixed(4) }}, {{ calibration.R[4].toFixed(4) }}, {{ calibration.R[5].toFixed(4) }}]<br>
-                [{{ calibration.R[6].toFixed(4) }}, {{ calibration.R[7].toFixed(4) }}, {{ calibration.R[8].toFixed(4) }}]
+                {{ formatRotationRow(calibration.R, 0) }}<br>
+                {{ formatRotationRow(calibration.R, 3) }}<br>
+                {{ formatRotationRow(calibration.R, 6) }}
               </v-card>
             </v-col>
           </v-row>
diff --git a/client/platform/desktop/backend/native/common.ts b/client/platform/desktop/backend/native/common.ts
index 6d4722cc6..9a3303c7d 100644
--- a/client/platform/desktop/backend/native/common.ts
+++ b/client/platform/desktop/backend/native/common.ts
@@ -31,6 +31,7 @@ import {
   PipelineParamType,
   DatasetCalibrationResult,
   DatasetStereoCalibration,
+  CameraCalibration,
 } from 'dive-common/apispec';
 import * as viameSerializers from 'platform/desktop/backend/serializers/viame';
 import * as nistSerializers from 'platform/desktop/backend/serializers/nist';
@@ -1925,35 +1926,72 @@ async function exportDatasetCalibration(
   return destPath;
 }
 
+function optionalCalibrationNumber(
+  data: Record<string, number | number[]>,
+  key: string,
+): number | undefined {
+  const value = data[key];
+  return value === undefined || value === null ? undefined : value as number;
+}
+
+function parseCameraCalibration(
+  data: Record<string, number | number[]>,
+  side: 'left' | 'right',
+): CameraCalibration {
+  const calib: CameraCalibration = {};
+  const fields: [string, keyof CameraCalibration][] = [
+    [`cx_${side}`, 'cx'],
+    [`cy_${side}`, 'cy'],
+    [`fx_${side}`, 'fx'],
+    [`fy_${side}`, 'fy'],
+    [`k1_${side}`, 'k1'],
+    [`k2_${side}`, 'k2'],
+    [`k3_${side}`, 'k3'],
+    [`p1_${side}`, 'p1'],
+    [`p2_${side}`, 'p2'],
+  ];
+  fields.forEach(([jsonKey, field]) => {
+    const value = optionalCalibrationNumber(data, jsonKey);
+    if (value !== undefined) {
+      calib[field] = value;
+    }
+  });
+  const rmsError = optionalCalibrationNumber(data, `rms_error_${side}`);
+  if (rmsError !== undefined) {
+    calib.rmsError = rmsError;
+  }
+  return calib;
+}
+
 /**
  * Parse a KWIVER/VIAME JSON camera-rig file into the shared
  * DatasetStereoCalibration shape. Mirrors the web server parser
  * (server/dive_server/crud_dataset.py:get_calibration).
  */
 function parseStereoCalibrationJson(data: Record<string, number | number[]>): DatasetStereoCalibration {
-  const cameraFor = (side: 'left' | 'right') => ({
-    cx: data[`cx_${side}`] as number,
-    cy: data[`cy_${side}`] as number,
-    fx: data[`fx_${side}`] as number,
-    fy: data[`fy_${side}`] as number,
-    k1: data[`k1_${side}`] as number,
-    k2: data[`k2_${side}`] as number,
-    k3: data[`k3_${side}`] as number,
-    p1: data[`p1_${side}`] as number,
-    p2: data[`p2_${side}`] as number,
-    rmsError: data[`rms_error_${side}`] as number,
-  });
-  return {
+  const result: DatasetStereoCalibration = {
     R: data.R as number[],
     T: data.T as number[],
-    gridHeight: data.grid_height as number,
-    gridWidth: data.grid_width as number,
-    imageHeight: data.image_height as number,
-    imageWidth: data.image_width as number,
-    squareSize: data.square_size_mm as number,
-    rmsError: data.rms_error_stereo as number,
-    calibrations: { left: cameraFor('left'), right: cameraFor('right') },
+    calibrations: {
+      left: parseCameraCalibration(data, 'left'),
+      right: parseCameraCalibration(data, 'right'),
+    },
   };
+  const optionalFields: [string, keyof DatasetStereoCalibration][] = [
+    ['grid_height', 'gridHeight'],
+    ['grid_width', 'gridWidth'],
+    ['image_height', 'imageHeight'],
+    ['image_width', 'imageWidth'],
+    ['square_size_mm', 'squareSize'],
+    ['rms_error_stereo', 'rmsError'],
+  ];
+  optionalFields.forEach(([jsonKey, field]) => {
+    const value = optionalCalibrationNumber(data, jsonKey);
+    if (value !== undefined) {
+      result[field] = value;
+    }
+  });
+  return result;
 }
 
 /**
diff --git a/server/dive_server/crud_dataset.py b/server/dive_server/crud_dataset.py
index 223c8ad46..fd460b59f 100644
--- a/server/dive_server/crud_dataset.py
+++ b/server/dive_server/crud_dataset.py
@@ -1065,42 +1065,56 @@ def _mark_calibration_source_and_json_item(cal_item: dict) -> None:
     )
 
 
+def _optional_calibration_number(data: dict, key: str) -> float | None:
+    if key not in data or data[key] is None:
+        return None
+    return float(data[key])
+
+
+def _parse_camera_calibration(data: dict, side: str) -> types.CameraCalibration:
+    calib: types.CameraCalibration = {}
+    for json_key, field in (
+        (f'cx_{side}', 'cx'),
+        (f'cy_{side}', 'cy'),
+        (f'fx_{side}', 'fx'),
+        (f'fy_{side}', 'fy'),
+        (f'k1_{side}', 'k1'),
+        (f'k2_{side}', 'k2'),
+        (f'k3_{side}', 'k3'),
+        (f'p1_{side}', 'p1'),
+        (f'p2_{side}', 'p2'),
+    ):
+        value = _optional_calibration_number(data, json_key)
+        if value is not None:
+            calib[field] = value
+    rms_error = _optional_calibration_number(data, f'rms_error_{side}')
+    if rms_error is not None:
+        calib['rmsError'] = rms_error
+    return calib
+
+
 def _parse_stereo_calibration_json(data: dict) -> types.DatasetStereoCalibration:
-    calib_left = types.CameraCalibration(
-        cx=data['cx_left'],
-        cy=data['cy_left'],
-        fx=data['fx_left'],
-        fy=data['fy_left'],
-        k1=data['k1_left'],
-        k2=data['k2_left'],
-        k3=data['k3_left'],
-        p1=data['p1_left'],
-        p2=data['p2_left'],
-        rmsError=data['rms_error_left'],
-    )
-    calib_right = types.CameraCalibration(
-        cx=data['cx_right'],
-        cy=data['cy_right'],
-        fx=data['fx_right'],
-        fy=data['fy_right'],
-        k1=data['k1_right'],
-        k2=data['k2_right'],
-        k3=data['k3_right'],
-        p1=data['p1_right'],
-        p2=data['p2_right'],
-        rmsError=data['rms_error_right'],
-    )
-    return types.DatasetStereoCalibration(
-        R=data['R'],
-        T=data['T'],
-        gridHeight=data['grid_height'],
-        gridWidth=data['grid_width'],
-        imageHeight=data['image_height'],
-        imageWidth=data['image_width'],
-        squareSize=data['square_size_mm'],
-        rmsError=data['rms_error_stereo'],
-        calibrations={'left': calib_left, 'right': calib_right},
+    result: types.DatasetStereoCalibration = {
+        'R': data['R'],
+        'T': data['T'],
+        'calibrations': {
+            'left': _parse_camera_calibration(data, 'left'),
+            'right': _parse_camera_calibration(data, 'right'),
+        },
+    }
+    optional_fields = (
+        ('grid_height', 'gridHeight'),
+        ('grid_width', 'gridWidth'),
+        ('image_height', 'imageHeight'),
+        ('image_width', 'imageWidth'),
+        ('square_size_mm', 'squareSize'),
+        ('rms_error_stereo', 'rmsError'),
     )
+    for json_key, field in optional_fields:
+        value = _optional_calibration_number(data, json_key)
+        if value is not None:
+            result[field] = int(value) if field.startswith('grid') or field.startswith('image') else value
+    return result
 
 
 def _read_json_calibration_file(
diff --git a/server/dive_utils/types.py b/server/dive_utils/types.py
index 496e928e8..8bb5aa6c1 100644
--- a/server/dive_utils/types.py
+++ b/server/dive_utils/types.py
@@ -182,7 +182,7 @@ class DIVEAnnotationSchema(TypedDict):
     version: int
 
 
-class CameraCalibration(TypedDict):
+class CameraCalibration(TypedDict, total=False):
     cx: float
     cy: float
     fx: float
@@ -198,13 +198,13 @@ class CameraCalibration(TypedDict):
 class DatasetStereoCalibration(TypedDict):
     R: List[float]
     T: List[float]
-    gridHeight: int
-    gridWidth: int
-    imageHeight: int
-    imageWidth: int
-    squareSize: float
-    rmsError: float
     calibrations: Dict[str, CameraCalibration]
+    gridHeight: NotRequired[int]
+    gridWidth: NotRequired[int]
+    imageHeight: NotRequired[int]
+    imageWidth: NotRequired[int]
+    squareSize: NotRequired[float]
+    rmsError: NotRequired[float]
 
 
 class DatasetCalibrationResult(TypedDict):

From c8f5db9d8e83ab72bbf11d79cc90794881894fa4 Mon Sep 17 00:00:00 2001
From: Bryon Lewis <Bryon.Lewis@kitware.com>
Date: Sat, 27 Jun 2026 16:50:40 -0400
Subject: [PATCH 25/25] add import calibration for stereoscopic web datasets

---
 .../components/ImportAnnotations.vue          |  4 +-
 .../web-girder/api/dataset.service.ts         |  2 +-
 .../web-girder/multicamFileRegistry.ts        |  6 ++-
 .../web-girder/views/ViewerLoader.vue         | 37 +++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/client/dive-common/components/ImportAnnotations.vue b/client/dive-common/components/ImportAnnotations.vue
index 5294ddd28..ec67c4f9c 100644
--- a/client/dive-common/components/ImportAnnotations.vue
+++ b/client/dive-common/components/ImportAnnotations.vue
@@ -63,8 +63,8 @@ export default defineComponent({
       const parts = (props.datasetId || '').split('/');
       return parts.length > 1 ? parts[1] : null;
     });
-    // Camera/calibration file import is desktop-only (needs importCalibrationFile)
-    // and only meaningful for stereo datasets.
+    // Camera/calibration file import requires importCalibrationFile (web + desktop)
+    // and is only meaningful for stereo datasets.
     const cameraFileSupported = computed(
       () => !!api.importCalibrationFile && props.subType === 'stereo',
     );
diff --git a/client/platform/web-girder/api/dataset.service.ts b/client/platform/web-girder/api/dataset.service.ts
index 13c4f1b7e..ccfec738e 100644
--- a/client/platform/web-girder/api/dataset.service.ts
+++ b/client/platform/web-girder/api/dataset.service.ts
@@ -81,7 +81,7 @@ function clone({
 
 function getDatasetCalibration(datasetId: string) {
   return girderRest.get('dive_dataset/calibration', {
-    params: { folderId: datasetId },
+    params: { folderId: parentDatasetId(datasetId) },
   });
 }
 
diff --git a/client/platform/web-girder/multicamFileRegistry.ts b/client/platform/web-girder/multicamFileRegistry.ts
index 675f9959b..3fb568501 100644
--- a/client/platform/web-girder/multicamFileRegistry.ts
+++ b/client/platform/web-girder/multicamFileRegistry.ts
@@ -1,6 +1,7 @@
 /** Stash browser File selections for multicam import (paths are not filesystem paths on web). */
 
 import { Location } from '@girder/components/src';
+import { parentDatasetId } from 'dive-common/compositeDatasetId';
 import { openFromDisk, GirderUploadManager } from './utils';
 
 const LAST_CALIBRATION_STORAGE_KEY = 'dive_web_last_calibration';
@@ -185,15 +186,16 @@ export async function importCalibrationFile(
   if (!file) {
     throw new Error(`Calibration file "${fileName}" is no longer available; please re-select it.`);
   }
+  const parentFolderId = parentDatasetId(datasetId);
   // Import the Girder REST client lazily: its module touches `window` at load time,
   // so a top-level import breaks node-environment unit tests that import this module.
   const { default: girderRest } = await import('platform/web-girder/plugins/girder');
   const manager = new GirderUploadManager(file, {
     $rest: girderRest,
-    parent: { _id: datasetId, _modelType: 'folder' } as Location,
+    parent: { _id: parentFolderId, _modelType: 'folder' } as Location,
   });
   const uploaded = await manager.start() as { _id: string };
-  await girderRest.post(`dive_dataset/${datasetId}/calibration`, null, {
+  await girderRest.post(`dive_dataset/${parentFolderId}/calibration`, null, {
     params: { fileId: uploaded._id },
   });
   localStorage.setItem(LAST_CALIBRATION_STORAGE_KEY, file.name);
diff --git a/client/platform/web-girder/views/ViewerLoader.vue b/client/platform/web-girder/views/ViewerLoader.vue
index 04e1ec3d9..ba71471c0 100644
--- a/client/platform/web-girder/views/ViewerLoader.vue
+++ b/client/platform/web-girder/views/ViewerLoader.vue
@@ -18,6 +18,8 @@ import { useLocation } from 'platform/web-girder/store/useLocation';
 import { useJobs } from 'platform/web-girder/store/useJobs';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
 import type { DatasetType, SubType } from 'dive-common/apispec';
+import { useApi } from 'dive-common/apispec';
+import { parentDatasetId } from 'dive-common/compositeDatasetId';
 import { getMultiCamCameraCount } from 'dive-common/pipelineMenuFilters';
 import { webExcludedPipelineTerms } from 'dive-common/constants';
 import { convertLargeImage } from 'platform/web-girder/api/rpc.service';
@@ -102,7 +104,9 @@ export default defineComponent({
   setup(props) {
     const { prompt } = usePrompt();
     const router = useRouter();
+    const { getDatasetCalibration } = useApi();
     const viewerRef = ref();
+    const calibrationFile = ref<string | null>(null);
     const { brandData } = useBrand();
     const { pipelinesEnabled } = useConfig();
     const { meta: datasetMeta, loadDataset } = useDataset();
@@ -129,6 +133,33 @@ export default defineComponent({
       });
     }, { immediate: true });
 
+    async function refreshCalibrationFile() {
+      if (!getDatasetCalibration || subTypeList.value[0] !== 'stereo') {
+        calibrationFile.value = null;
+        return;
+      }
+      try {
+        const result = await getDatasetCalibration(parentDatasetId(props.id));
+        calibrationFile.value = result?.originalName ?? result?.jsonPath ?? result?.path ?? null;
+      } catch {
+        calibrationFile.value = null;
+      }
+    }
+
+    watch(
+      () => [props.id, subTypeList.value[0]] as const,
+      () => {
+        refreshCalibrationFile().catch((reason) => {
+          reportHandledPromiseRejection('ViewerLoader: refreshCalibrationFile', reason);
+        });
+      },
+      { immediate: true },
+    );
+
+    function onCalibrationImported(name: string) {
+      calibrationFile.value = name;
+    }
+
     watch(
       () => viewerRef.value?.trackFilters?.timeFilters?.value,
       (value) => {
@@ -257,6 +288,8 @@ export default defineComponent({
       timeFilter,
       pipelinesEnabled,
       webExcludedPipelineTerms,
+      calibrationFile,
+      onCalibrationImported,
     };
   },
 });
@@ -311,7 +344,10 @@ export default defineComponent({
         :menu-options="menuOptions"
         :read-only-mode="!!jobs.getDatasetRunningState(id) || revisionNum !== undefined"
         :dataset-id="id"
+        :sub-type="subTypeList[0]"
+        :calibration-file="calibrationFile"
         block-on-unsaved
+        @calibration-imported="onCalibrationImported"
       />
       <Export
         v-bind="{ buttonOptions, menuOptions }"
@@ -329,6 +365,7 @@ export default defineComponent({
       <CalibrationMenu
         v-if="subTypeList[0] === 'stereo'"
         :dataset-id="id"
+        :calibration-file="calibrationFile"
       />
     </template>
     <template #right-sidebar="{ sidebarMode }">