[3] In 2008, the station building was rebuilt by the city for $1.4 million ($1.98 million in 2023 adjusted for inflation) as an intermodal station in anticipation of serving passengers on the then-proposed Sonoma–Marin Area Rail Transit (SMART) commuter rail line.

In September 2018, the SMART board approved $24 million in construction contracts, with service to Windsor expected to begin in late 2021 or early 2022.

[6][7] In 2020 the project completion was delayed to later in 2022 as funding from a recent bridge toll increase was withheld pending litigation.

[8] By spring of 2022 the SMART extension was 30% complete, but the lawsuit related to toll increases as well as a separate suit regarding use of the right-of-way had delayed the station's opening indefinitely.

[11] In June 2023, the agency received a $30 million state grant, sufficient to complete the Windsor extension.