From 18d98d9452875b12f8b22c7b696b1a5cdf40c86c Mon Sep 17 00:00:00 2001
From: mallesh-bot <palukurimallesh@gmail.com>
Date: Wed, 2 Sep 2026 13:37:25 +0530
Subject: [PATCH] fix(cli): abort incomplete calibration sessions

---
 .../wifi-densepose-cli/src/calibrate_api.rs   | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/v2/crates/wifi-densepose-cli/src/calibrate_api.rs b/v2/crates/wifi-densepose-cli/src/calibrate_api.rs
index 8be6fb034..49ad1dcc4 100644
--- a/v2/crates/wifi-densepose-cli/src/calibrate_api.rs
+++ b/v2/crates/wifi-densepose-cli/src/calibrate_api.rs
@@ -536,7 +536,7 @@ async fn ingest_loop(
                 if let Some(sess) = active.as_ref() {
                     if Instant::now() >= sess.deadline {
                         let frames = sess.recorder.frames_recorded() as usize;
-                        if frames >= 10 {
+                        if frames >= sess.target_frames {
                             if let Some(done) = active.take() {
                                 let _ = finalize(done, &output_dir, &status).await;
                             }
@@ -544,8 +544,9 @@ async fn ingest_loop(
                             // not enough frames — abort honestly rather than emit a bad baseline
                             done.motion_flagged = false;
                             let note = format!(
-                                "aborted: only {frames} frames in the time window (need >=10) — \
+                                "aborted: only {frames} frames in the time window (need >= {}) — \
                                  is the ESP32 streaming to udp:{}? ",
+                                done.target_frames,
                                 status.read().await.udp_port
                             );
                             let snap = session_snapshot(&done, "aborted", Some(note.clone()));
@@ -615,10 +616,17 @@ async fn finalize(
         status.write().await.session = Some(snap);
     }
 
-    let baseline: BaselineCalibration = sess
-        .recorder
-        .finalize()
-        .map_err(|e| format!("finalize failed: {e}"))?;
+    let baseline: BaselineCalibration = match sess.recorder.finalize() {
+        Ok(baseline) => baseline,
+        Err(e) => {
+            let message = format!("finalize failed: {e}");
+            let note = format!("aborted: {message}");
+            let snap = session_snapshot(&sess, "aborted", Some(note.clone()));
+            status.write().await.session = Some(snap);
+            eprintln!("[calibrate-serve] {note}");
+            return Err(message);
+        }
+    };
 
     let (amp_mean_avg, amp_var_avg, disp_avg) = baseline_averages(&baseline);
     let uuid = baseline.calibration_uuid().to_string();
@@ -1055,6 +1063,33 @@ mod tests {
         assert_eq!(a.udp_port, 5005);
     }
 
+    #[tokio::test]
+    async fn finalize_insufficient_frames_marks_session_aborted() {
+        let dir = tempfile::tempdir().unwrap();
+        let status = Arc::new(RwLock::new(SharedStatus::default()));
+        let sess = ActiveSession {
+            recorder: CalibrationRecorder::new(tier_config("ht20")),
+            room_id: "test".into(),
+            tier: "ht20".into(),
+            started: Instant::now(),
+            deadline: Instant::now(),
+            target_frames: 1,
+            z_median: 0.0,
+            z_max: 0.0,
+            motion_flagged: false,
+        };
+
+        let err = finalize(sess, dir.path().to_str().unwrap(), &status)
+            .await
+            .expect_err("an empty recorder cannot finalize");
+        assert!(err.contains("finalize failed"));
+
+        let guard = status.read().await;
+        let session = guard.session.as_ref().expect("terminal session status");
+        assert_eq!(session.state, "aborted");
+        assert!(session.note.as_deref().unwrap_or_default().contains("finalize failed"));
+    }
+
     #[test]
     fn sanitize_blocks_path_traversal() {
         assert_eq!(sanitize_room_id("../../etc/passwd"), "etcpasswd");