v0.9.7

src/api.rs

@@ -654,11 +654,18 @@ async fn update_zone_control(State(state): State<AppState>, Path(id): Path<Strin
     }
     if let Some(value) = patch.enabled { zone.enabled = value; }
     let device_override_cleared = if resume_device_automation { engine::reset_device_manual_override(&mut zone) } else { false };
+    let house_mode = state.settings.read().await.house_mode.clone();
+    engine::refresh_zone_runtime_target(&mut zone, &schedules, &house_mode);
     zone.updated_at = Utc::now();
     state.db.save_zone(&zone)?;
     state.broadcast("zone.updated", serde_json::to_value(&zone)?);
     if was_enabled && !zone.enabled {
         power_off_zone_device(&state, &zone, "zone.quick_disabled").await;
+    } else {
+        // Do not force users to wait for the fixed zone interval after selecting a profile,
+        // changing the target/mode or re-enabling a thermostat. The regulator still owns the
+        // physical command and therefore keeps all group/master/manual-override safeguards.
+        state.wake_zone_control();
     }
     state.log("info", "zone.quick_control", &format!("Quick control updated for {}", zone.name), json!({
         "zone_id": zone.id, "setpoint": zone.setpoint, "manual_setpoint": zone.manual_setpoint, "mode": zone.mode,
@@ -913,6 +920,7 @@ async fn list_home_assistant_groups(State(state): State<AppState>) -> Result<Jso
             "device_id": zone.device_id,
             "device_name": zone.device_name,
             "enabled": zone.enabled,
+            "effective_enabled": zone.effective_enabled,
             "mode": zone.mode,
             "configured_mode": zone.configured_mode,
             "inherit_house_mode": zone.inherit_house_mode,
@@ -938,7 +946,7 @@ async fn list_home_assistant_groups(State(state): State<AppState>) -> Result<Jso
             "house_mode": settings.house_mode,
             "zone_count": members.len(),
             "enabled_zones": members.iter().filter(|zone| zone.enabled).count(),
-            "active_zones": planned_members.iter().filter(|zone| zone.enabled).count(),
+            "active_zones": planned_members.iter().filter(|zone| zone.effective_enabled).count(),
             "demanding_zones": planned_members.iter().filter(|zone| zone.demand).count(),
             "device_count": member_device_ids.len(),
             "online_devices": online_devices,
@@ -1124,6 +1132,7 @@ async fn update_house_preset(State(state): State<AppState>, Json(input): Json<Ho
     }
 
     let failed = command_all_enabled_devices_power(&state, true, "house_preset").await?;
+    state.wake_zone_control();
     let devices = state.db.list_devices()?;
     state.log("info", "house.preset", &format!("House preset set to {}", input.preset), json!({
         "preset": input.preset,