From b0a4e2ea93fafc4d65d474f3ada616a0ad5e19d5 Mon Sep 17 00:00:00 2001
From: Ariver <ar@Arm1.local>
Date: Sun, 12 Jul 2026 11:39:35 +0800
Subject: [PATCH] feat: bind helper stream timing markers

---
 src/main.rs |  638 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 617 insertions(+), 21 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 62107a9..611993a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,8 @@
 mod service;
 
 use std::{
+    borrow::Cow,
+    collections::HashSet,
     env, fs,
     path::{Path, PathBuf},
     sync::{
@@ -32,17 +34,29 @@
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use tokio::time::{sleep, sleep_until};
-use tokio::{sync::mpsc::UnboundedReceiver, task::JoinHandle};
+use sha2::{Digest, Sha256};
+use tokio::time::{sleep, sleep_until, timeout};
+use tokio::{
+    sync::{mpsc, mpsc::UnboundedReceiver, watch},
+    task::JoinHandle,
+};
 use tracing::{info, warn};
 
 const USER_AUDIO_SAMPLE_RATE_HZ: u32 = 48_000;
 const USER_AUDIO_NUM_CHANNELS: u16 = 1;
+const INBOUND_AUDIO_QUEUE_CAPACITY: usize = 100;
+const INBOUND_AUDIO_DROP_LOG_INTERVAL: u64 = 100;
+const AUDIO_DRAIN_STOP_GRACE: Duration = Duration::from_secs(2);
 const DEFAULT_BOT_AUDIO_PROFILE: &str = "pcm-16k";
 const LIVEKIT_48K_SAMPLE_RATE_HZ: u32 = 48_000;
 const PCM_16K_SAMPLE_RATE_HZ: u32 = 16_000;
 const BOT_NUM_CHANNELS: u16 = 1;
 const TRACK_NAME: &str = "bot-main-audio";
+const STREAM_TIMING_VERSION: u32 = 1;
+const STREAM_TIMING_FIRST_SEGMENT: u64 = 1;
+const STREAM_TIMING_FIRST_CHUNK: u64 = 1;
+const STREAM_TIMING_MAX_ELAPSED_MS: u64 = 5_000;
+const STREAM_TIMING_SOURCE: &str = "stream_anchor_monotonic";
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
@@ -652,6 +666,31 @@
         "reasonCode": reason_code,
         "retryable": retryable,
         "extension": extension,
+    });
+    println!("{payload}");
+}
+
+fn emit_anchored_activity(
+    call_id: &str,
+    trace_id: &str,
+    turn_id: &str,
+    event_name: &str,
+    marker: &RuntimeTurnStreamTimingMarker,
+    extension: serde_json::Value,
+) {
+    let payload = json!({
+        "type": "cv_activity",
+        "callId": call_id,
+        "traceId": trace_id,
+        "turnId": turn_id,
+        "eventName": event_name,
+        "eventWallTimeMs": current_time_millis(),
+        "serverDeltaMs": marker.server_delta_ms,
+        "serverDeltaSource": STREAM_TIMING_SOURCE,
+        "result": "ok",
+        "reasonCode": null,
+        "retryable": null,
+        "extension": marker.extension_with(extension),
     });
     println!("{payload}");
 }
@@ -1412,6 +1451,7 @@
             .await?;
         }
     }
+    state.close_timing();
     if !state.completed {
         warn!(
             call_id = %call_id,
@@ -1541,6 +1581,7 @@
                 call_id,
                 trace_id,
                 turn,
+                &event,
                 audio_chunk,
                 state,
                 turn_pipeline_started_at,
@@ -1559,6 +1600,7 @@
         }
         Some("turn_completed") => {
             state.completed = true;
+            state.close_timing();
             info!(
                 call_id = %call_id,
                 trace_id = %trace_id,
@@ -1569,6 +1611,7 @@
             );
         }
         Some("turn_failed") => {
+            state.close_timing();
             let error = event.error.as_ref();
             let reason_code = error
                 .and_then(|value| value.reason_code.as_deref())
@@ -1603,6 +1646,7 @@
         }
         Some("turn_cancelled") => {
             state.completed = true;
+            state.close_timing();
             info!(
                 call_id = %call_id,
                 trace_id = %trace_id,
@@ -1635,6 +1679,19 @@
         }
         Some("activity") => {
             if let Some(activity) = event.activity.as_ref() {
+                if activity.event_type.as_deref() == Some("tts_first_audio_chunk_ready") {
+                    if let Some(runtime_session_nonce) =
+                        bridge_config.runtime_session_nonce.as_deref()
+                    {
+                        let _ = state.arm_timing_anchor(
+                            call_id,
+                            trace_id,
+                            &turn.turn_id,
+                            runtime_session_nonce,
+                            &event,
+                        );
+                    }
+                }
                 info!(
                     call_id = %call_id,
                     trace_id = %trace_id,
@@ -1693,6 +1750,7 @@
     call_id: &str,
     trace_id: &str,
     turn: &FinishedSpeechTurn,
+    event: &RuntimeTurnStreamEvent,
     audio_chunk: &RuntimeTurnStreamAudioChunk,
     state: &mut RuntimeTurnStreamState,
     turn_pipeline_started_at: Instant,
@@ -1712,6 +1770,58 @@
         .unwrap_or("pcm_s16le")
         .trim()
         .to_ascii_lowercase();
+    if !matches!(format.as_str(), "pcm_s16le" | "mp3" | "mpeg" | "wav") {
+        return Err(anyhow!("unsupported reply_audio_chunk format {format}"));
+    }
+    match state.reply_chunk_markers.observe(audio_chunk.segment_seq) {
+        ReplyChunkMarker::FirstReply => {
+            let extension = json!({
+                "segmentSeq": audio_chunk.segment_seq,
+                "chunkSeq": audio_chunk.chunk_seq,
+                "format": format.as_str(),
+                "bytes": payload.len(),
+            });
+            if let Some(marker) =
+                state.record_m6(call_id, trace_id, &turn.turn_id, event, audio_chunk)
+            {
+                emit_anchored_activity(
+                    call_id,
+                    trace_id,
+                    &turn.turn_id,
+                    "helper_first_reply_audio_chunk_received",
+                    &marker,
+                    extension,
+                );
+            } else {
+                emit_activity(
+                    call_id,
+                    trace_id,
+                    Some(&turn.turn_id),
+                    "helper_first_reply_audio_chunk_received",
+                    "ok",
+                    None,
+                    None,
+                    extension,
+                );
+            }
+        }
+        ReplyChunkMarker::SegmentFirst => emit_activity(
+            call_id,
+            trace_id,
+            Some(&turn.turn_id),
+            "helper_segment_first_audio_chunk_received",
+            "ok",
+            None,
+            None,
+            json!({
+                "segmentSeq": audio_chunk.segment_seq,
+                "chunkSeq": audio_chunk.chunk_seq,
+                "format": format.as_str(),
+                "bytes": payload.len(),
+            }),
+        ),
+        ReplyChunkMarker::None => {}
+    }
     let frames = if format == "pcm_s16le" {
         let sample_rate = audio_chunk.sample_rate.unwrap_or(sink.sample_rate_hz);
         let channels = audio_chunk.channels.unwrap_or(u32::from(sink.num_channels));
@@ -1803,7 +1913,7 @@
             Err(error) => return Err(error).context("failed to decode final stream audio chunk"),
         }
     } else {
-        return Err(anyhow!("unsupported reply_audio_chunk format {format}"));
+        unreachable!("supported encoded format checked above")
     };
     if frames.is_empty() {
         return Ok(0);
@@ -1831,21 +1941,33 @@
         sink.write_pcm_frame(frame).await?;
         if !state.first_audio_frame_written {
             state.first_audio_frame_written = true;
-            emit_activity(
-                call_id,
-                trace_id,
-                Some(&turn.turn_id),
-                "bot_reply_first_audio_frame_written",
-                "ok",
-                None,
-                None,
-                json!({
-                    "replyPlaybackMode": state.reply_playback_mode.as_str(),
-                    "format": format.as_str(),
-                    "chunkSeq": audio_chunk.chunk_seq,
-                    "replyTotalAfterVadEndMs": turn_pipeline_started_at.elapsed().as_millis() as u64,
-                }),
-            );
+            let extension = json!({
+                "replyPlaybackMode": state.reply_playback_mode.as_str(),
+                "format": format.as_str(),
+                "chunkSeq": audio_chunk.chunk_seq,
+                "replyTotalAfterVadEndMs": turn_pipeline_started_at.elapsed().as_millis() as u64,
+            });
+            if let Some(marker) = state.record_m7() {
+                emit_anchored_activity(
+                    call_id,
+                    trace_id,
+                    &turn.turn_id,
+                    "bot_reply_first_audio_frame_written",
+                    &marker,
+                    extension,
+                );
+            } else {
+                emit_activity(
+                    call_id,
+                    trace_id,
+                    Some(&turn.turn_id),
+                    "bot_reply_first_audio_frame_written",
+                    "ok",
+                    None,
+                    None,
+                    extension,
+                );
+            }
         }
         sleep_until(pacing_started_at + Duration::from_millis(((index + 1) as u64) * 20)).await;
     }
@@ -2302,6 +2424,8 @@
     encoded_audio_buffer: Vec<u8>,
     pcm_stream_decoder: Option<audio::PcmS16leStreamDecoder>,
     pcm_stream_network_chunk_count: u64,
+    reply_chunk_markers: ReplyChunkMarkerState,
+    timing: RuntimeTurnStreamTimingState,
 }
 
 impl Default for RuntimeTurnStreamState {
@@ -2317,7 +2441,262 @@
             encoded_audio_buffer: Vec::new(),
             pcm_stream_decoder: None,
             pcm_stream_network_chunk_count: 0,
+            reply_chunk_markers: ReplyChunkMarkerState::default(),
+            timing: RuntimeTurnStreamTimingState::default(),
         }
+    }
+}
+
+impl RuntimeTurnStreamState {
+    fn arm_timing_anchor(
+        &mut self,
+        call_id: &str,
+        trace_id: &str,
+        turn_id: &str,
+        runtime_session_nonce: &str,
+        event: &RuntimeTurnStreamEvent,
+    ) -> bool {
+        if self.timing.phase != RuntimeTurnStreamTimingPhase::Empty
+            || event.call_id.as_deref() != Some(call_id)
+            || event.trace_id.as_deref() != Some(trace_id)
+            || event.turn_id.as_deref() != Some(turn_id)
+        {
+            return false;
+        }
+        let Some(activity) = event.activity.as_ref() else {
+            return false;
+        };
+        if activity.event_type.as_deref() != Some("tts_first_audio_chunk_ready") {
+            return false;
+        }
+        let Some(extension) = activity.extension.as_ref() else {
+            return false;
+        };
+        let Some(anchor_id) = extension.stream_anchor_id.as_deref() else {
+            return false;
+        };
+        let valid_anchor_id = (16..=64).contains(&anchor_id.len()) && anchor_id.is_ascii();
+        let expected_nonce_hash = runtime_session_nonce_hash(runtime_session_nonce);
+        if extension.stream_timing_version != Some(STREAM_TIMING_VERSION)
+            || !valid_anchor_id
+            || extension.runtime_session_nonce_hash.as_deref() != Some(expected_nonce_hash.as_str())
+            || extension.segment_seq != Some(STREAM_TIMING_FIRST_SEGMENT)
+            || extension.stream_timing_validation.as_deref() != Some("bound")
+        {
+            return false;
+        }
+        let Some(server_delta_ms) = extension.stream_anchor_server_delta_ms else {
+            return false;
+        };
+        self.timing.anchor = Some(RuntimeTurnStreamTimingAnchor {
+            call_id: call_id.to_string(),
+            trace_id: trace_id.to_string(),
+            turn_id: turn_id.to_string(),
+            anchor_id: anchor_id.to_string(),
+            server_delta_ms,
+            runtime_session_nonce_hash: expected_nonce_hash,
+            segment_seq: STREAM_TIMING_FIRST_SEGMENT,
+            received_at: Instant::now(),
+        });
+        self.timing.phase = RuntimeTurnStreamTimingPhase::Armed;
+        true
+    }
+
+    fn record_m6(
+        &mut self,
+        call_id: &str,
+        trace_id: &str,
+        turn_id: &str,
+        event: &RuntimeTurnStreamEvent,
+        audio_chunk: &RuntimeTurnStreamAudioChunk,
+    ) -> Option<RuntimeTurnStreamTimingMarker> {
+        if self.timing.phase != RuntimeTurnStreamTimingPhase::Armed {
+            return None;
+        }
+        let anchor = self.timing.anchor.as_ref()?;
+        if anchor.call_id != call_id
+            || anchor.trace_id != trace_id
+            || anchor.turn_id != turn_id
+            || event.call_id.as_deref() != Some(call_id)
+            || event.trace_id.as_deref() != Some(trace_id)
+            || event.turn_id.as_deref() != Some(turn_id)
+            || audio_chunk.segment_seq != Some(anchor.segment_seq)
+            || audio_chunk.chunk_seq != Some(STREAM_TIMING_FIRST_CHUNK)
+            || audio_chunk.stream_timing_version != Some(STREAM_TIMING_VERSION)
+            || audio_chunk.stream_anchor_id.as_deref() != Some(anchor.anchor_id.as_str())
+        {
+            return None;
+        }
+        let Some(marker) = RuntimeTurnStreamTimingMarker::from_anchor(
+            anchor,
+            audio_chunk.chunk_seq.unwrap_or(STREAM_TIMING_FIRST_CHUNK),
+        ) else {
+            self.close_timing();
+            return None;
+        };
+        self.timing.chunk_seq = Some(marker.chunk_seq);
+        self.timing.phase = RuntimeTurnStreamTimingPhase::M6Recorded;
+        Some(marker)
+    }
+
+    fn record_m7(&mut self) -> Option<RuntimeTurnStreamTimingMarker> {
+        if self.timing.phase != RuntimeTurnStreamTimingPhase::M6Recorded {
+            return None;
+        }
+        let anchor = self.timing.anchor.as_ref()?;
+        let Some(marker) = RuntimeTurnStreamTimingMarker::from_anchor(
+            anchor,
+            self.timing.chunk_seq.unwrap_or(STREAM_TIMING_FIRST_CHUNK),
+        ) else {
+            self.close_timing();
+            return None;
+        };
+        self.timing.phase = RuntimeTurnStreamTimingPhase::M7Recorded;
+        Some(marker)
+    }
+
+    fn close_timing(&mut self) {
+        self.timing.close();
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum RuntimeTurnStreamTimingPhase {
+    Empty,
+    Armed,
+    M6Recorded,
+    M7Recorded,
+    Closed,
+}
+
+struct RuntimeTurnStreamTimingState {
+    phase: RuntimeTurnStreamTimingPhase,
+    anchor: Option<RuntimeTurnStreamTimingAnchor>,
+    chunk_seq: Option<u64>,
+}
+
+impl Default for RuntimeTurnStreamTimingState {
+    fn default() -> Self {
+        Self {
+            phase: RuntimeTurnStreamTimingPhase::Empty,
+            anchor: None,
+            chunk_seq: None,
+        }
+    }
+}
+
+impl RuntimeTurnStreamTimingState {
+    fn close(&mut self) {
+        self.anchor = None;
+        self.chunk_seq = None;
+        self.phase = RuntimeTurnStreamTimingPhase::Closed;
+    }
+}
+
+impl Drop for RuntimeTurnStreamTimingState {
+    fn drop(&mut self) {
+        self.anchor = None;
+        self.chunk_seq = None;
+    }
+}
+
+struct RuntimeTurnStreamTimingAnchor {
+    call_id: String,
+    trace_id: String,
+    turn_id: String,
+    anchor_id: String,
+    server_delta_ms: u64,
+    runtime_session_nonce_hash: String,
+    segment_seq: u64,
+    received_at: Instant,
+}
+
+struct RuntimeTurnStreamTimingMarker {
+    version: u32,
+    anchor_id: String,
+    anchor_server_delta_ms: u64,
+    anchor_elapsed_ms: u64,
+    server_delta_ms: u64,
+    runtime_session_nonce_hash: String,
+    segment_seq: u64,
+    chunk_seq: u64,
+}
+
+impl RuntimeTurnStreamTimingMarker {
+    fn from_anchor(anchor: &RuntimeTurnStreamTimingAnchor, chunk_seq: u64) -> Option<Self> {
+        let elapsed_ms = u64::try_from(anchor.received_at.elapsed().as_millis()).ok()?;
+        if elapsed_ms > STREAM_TIMING_MAX_ELAPSED_MS {
+            return None;
+        }
+        Some(Self {
+            version: STREAM_TIMING_VERSION,
+            anchor_id: anchor.anchor_id.clone(),
+            anchor_server_delta_ms: anchor.server_delta_ms,
+            anchor_elapsed_ms: elapsed_ms,
+            server_delta_ms: anchor.server_delta_ms.checked_add(elapsed_ms)?,
+            runtime_session_nonce_hash: anchor.runtime_session_nonce_hash.clone(),
+            segment_seq: anchor.segment_seq,
+            chunk_seq,
+        })
+    }
+
+    fn extension_with(&self, extra: serde_json::Value) -> serde_json::Value {
+        let mut extension = match extra {
+            serde_json::Value::Object(value) => value,
+            _ => serde_json::Map::new(),
+        };
+        extension.insert("streamTimingVersion".to_string(), json!(self.version));
+        extension.insert("streamAnchorId".to_string(), json!(self.anchor_id));
+        extension.insert(
+            "streamAnchorServerDeltaMs".to_string(),
+            json!(self.anchor_server_delta_ms),
+        );
+        extension.insert("anchorElapsedMs".to_string(), json!(self.anchor_elapsed_ms));
+        extension.insert(
+            "runtimeSessionNonceHash".to_string(),
+            json!(self.runtime_session_nonce_hash),
+        );
+        extension.insert("segmentSeq".to_string(), json!(self.segment_seq));
+        extension.insert("chunkSeq".to_string(), json!(self.chunk_seq));
+        extension.insert("streamTimingValidation".to_string(), json!("bound"));
+        serde_json::Value::Object(extension)
+    }
+}
+
+fn runtime_session_nonce_hash(value: &str) -> String {
+    let digest = Sha256::digest(value.as_bytes());
+    digest[..6]
+        .iter()
+        .map(|byte| format!("{byte:02x}"))
+        .collect()
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum ReplyChunkMarker {
+    FirstReply,
+    SegmentFirst,
+    None,
+}
+
+#[derive(Default)]
+struct ReplyChunkMarkerState {
+    first_reply_seen: bool,
+    seen_segments: HashSet<u64>,
+}
+
+impl ReplyChunkMarkerState {
+    fn observe(&mut self, segment_seq: Option<u64>) -> ReplyChunkMarker {
+        let first_for_segment = segment_seq
+            .map(|value| self.seen_segments.insert(value))
+            .unwrap_or(false);
+        if !self.first_reply_seen {
+            self.first_reply_seen = true;
+            return ReplyChunkMarker::FirstReply;
+        }
+        if first_for_segment {
+            return ReplyChunkMarker::SegmentFirst;
+        }
+        ReplyChunkMarker::None
     }
 }
 
@@ -2337,6 +2716,12 @@
 struct RuntimeTurnStreamEvent {
     #[serde(rename = "type", alias = "event")]
     event_type: Option<String>,
+    #[serde(rename = "callId")]
+    call_id: Option<String>,
+    #[serde(rename = "traceId")]
+    trace_id: Option<String>,
+    #[serde(rename = "turnId")]
+    turn_id: Option<String>,
     #[serde(rename = "seq")]
     seq: Option<u64>,
     #[serde(rename = "replyPlaybackMode")]
@@ -2372,6 +2757,12 @@
 struct RuntimeTurnStreamAudioChunk {
     #[serde(rename = "chunkSeq", alias = "seq")]
     chunk_seq: Option<u64>,
+    #[serde(rename = "segmentSeq")]
+    segment_seq: Option<u64>,
+    #[serde(rename = "streamTimingVersion")]
+    stream_timing_version: Option<u32>,
+    #[serde(rename = "streamAnchorId")]
+    stream_anchor_id: Option<String>,
     format: Option<String>,
     #[serde(rename = "sampleRate")]
     sample_rate: Option<u32>,
@@ -2388,6 +2779,23 @@
     stage: Option<String>,
     #[serde(rename = "reasonCode")]
     reason_code: Option<String>,
+    extension: Option<RuntimeTurnStreamTimingExtension>,
+}
+
+#[derive(Clone, Deserialize)]
+struct RuntimeTurnStreamTimingExtension {
+    #[serde(rename = "streamTimingVersion")]
+    stream_timing_version: Option<u32>,
+    #[serde(rename = "streamAnchorId")]
+    stream_anchor_id: Option<String>,
+    #[serde(rename = "streamAnchorServerDeltaMs")]
+    stream_anchor_server_delta_ms: Option<u64>,
+    #[serde(rename = "runtimeSessionNonceHash")]
+    runtime_session_nonce_hash: Option<String>,
+    #[serde(rename = "segmentSeq")]
+    segment_seq: Option<u64>,
+    #[serde(rename = "streamTimingValidation")]
+    stream_timing_validation: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -2469,6 +2877,68 @@
             i32::from(USER_AUDIO_NUM_CHANNELS),
         );
         let started_at = Instant::now();
+        let (frame_tx, mut frame_rx) =
+            mpsc::channel::<DrainedUserAudioFrame>(INBOUND_AUDIO_QUEUE_CAPACITY);
+        let (drain_shutdown_tx, mut drain_shutdown_rx) = watch::channel(false);
+        let drain_call_id = call_id.clone();
+        let drain_trace_id = trace_id.clone();
+        let drain_task = tokio::spawn(async move {
+            let mut received_frame_count: u64 = 0;
+            let mut dropped_frame_count: u64 = 0;
+            loop {
+                tokio::select! {
+                    changed = drain_shutdown_rx.changed() => {
+                        match changed {
+                            Ok(()) if *drain_shutdown_rx.borrow() => break,
+                            Ok(()) => {}
+                            Err(_) => break,
+                        }
+                    }
+                    maybe_frame = stream.next() => {
+                        let Some(frame) = maybe_frame else {
+                            break;
+                        };
+                        received_frame_count = received_frame_count.saturating_add(1);
+                        let drained = DrainedUserAudioFrame {
+                            frame_index: received_frame_count,
+                            captured_elapsed_ms: started_at.elapsed().as_millis() as u64,
+                            frame: AudioFrame {
+                                data: Cow::Owned(frame.data.as_ref().to_vec()),
+                                sample_rate: frame.sample_rate,
+                                num_channels: frame.num_channels,
+                                samples_per_channel: frame.samples_per_channel,
+                            },
+                        };
+                        match frame_tx.try_send(drained) {
+                            Ok(()) => {}
+                            Err(mpsc::error::TrySendError::Full(_)) => {
+                                dropped_frame_count = dropped_frame_count.saturating_add(1);
+                                if dropped_frame_count % INBOUND_AUDIO_DROP_LOG_INTERVAL == 1 {
+                                    warn!(
+                                        call_id = %drain_call_id,
+                                        trace_id = %drain_trace_id,
+                                        dropped_frame_count,
+                                        received_frame_count,
+                                        queue_capacity = INBOUND_AUDIO_QUEUE_CAPACITY,
+                                        "runtime helper inbound_audio_queue_full_dropping_newest"
+                                    );
+                                }
+                            }
+                            Err(mpsc::error::TrySendError::Closed(_)) => break,
+                        }
+                    }
+                }
+            }
+            stream.close();
+            info!(
+                call_id = %drain_call_id,
+                trace_id = %drain_trace_id,
+                received_frame_count,
+                dropped_frame_count,
+                queue_capacity = INBOUND_AUDIO_QUEUE_CAPACITY,
+                "runtime helper user_audio_drain_ended"
+            );
+        });
         let mut frame_count: u64 = 0;
         let mut sample_count: u64 = 0;
         let mut simple_vad = if simple_vad_enabled {
@@ -2478,10 +2948,11 @@
         };
         let mut realtime_asr_upload: Option<RealtimeAsrUpload> = None;
 
-        while let Some(frame) = stream.next().await {
-            frame_count += 1;
+        while let Some(drained) = frame_rx.recv().await {
+            let frame = drained.frame;
+            frame_count = drained.frame_index;
             sample_count += u64::from(frame.samples_per_channel) * u64::from(frame.num_channels);
-            let elapsed_ms = started_at.elapsed().as_millis() as u64;
+            let elapsed_ms = drained.captured_elapsed_ms;
             if frame_count == 1 {
                 info!(
                     call_id = %call_id,
@@ -2641,6 +3112,21 @@
         if let Some(upload) = realtime_asr_upload.take() {
             upload.cancel("stream_end").await;
         }
+        let _ = drain_shutdown_tx.send(true);
+        let mut drain_task = drain_task;
+        if timeout(AUDIO_DRAIN_STOP_GRACE, &mut drain_task)
+            .await
+            .is_err()
+        {
+            drain_task.abort();
+            let _ = drain_task.await;
+            warn!(
+                call_id = %call_id,
+                trace_id = %trace_id,
+                stop_grace_ms = AUDIO_DRAIN_STOP_GRACE.as_millis() as u64,
+                "runtime helper user_audio_drain_stop_timeout"
+            );
+        }
 
         info!(
             call_id = %call_id,
@@ -2653,6 +3139,12 @@
             "runtime helper user_audio_stream_ended"
         );
     })
+}
+
+struct DrainedUserAudioFrame {
+    frame_index: u64,
+    captured_elapsed_ms: u64,
+    frame: AudioFrame<'static>,
 }
 
 async fn finish_realtime_asr_upload(
@@ -3398,3 +3890,107 @@
         Ok(())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{
+        ReplyChunkMarker, ReplyChunkMarkerState, RuntimeTurnStreamEvent, RuntimeTurnStreamState,
+        RuntimeTurnStreamTimingPhase, runtime_session_nonce_hash,
+    };
+
+    #[test]
+    fn reply_chunk_marker_state_emits_turn_first_once_and_later_segment_first_once() {
+        let mut state = ReplyChunkMarkerState::default();
+
+        assert_eq!(ReplyChunkMarker::FirstReply, state.observe(Some(1)));
+        assert_eq!(ReplyChunkMarker::None, state.observe(Some(1)));
+        assert_eq!(ReplyChunkMarker::SegmentFirst, state.observe(Some(2)));
+        assert_eq!(ReplyChunkMarker::None, state.observe(Some(2)));
+        assert_eq!(ReplyChunkMarker::SegmentFirst, state.observe(Some(3)));
+    }
+
+    #[test]
+    fn reply_chunk_marker_state_without_segment_only_emits_turn_first() {
+        let mut state = ReplyChunkMarkerState::default();
+
+        assert_eq!(ReplyChunkMarker::FirstReply, state.observe(None));
+        assert_eq!(ReplyChunkMarker::None, state.observe(None));
+    }
+
+    #[test]
+    fn runtime_turn_stream_audio_chunk_reads_segment_seq() {
+        let event: RuntimeTurnStreamEvent = serde_json::from_str(
+            r#"{"type":"reply_audio_chunk","audioChunk":{"chunkSeq":4,"segmentSeq":2,"format":"pcm_s16le","payloadBase64":"AA==","last":false}}"#,
+        )
+        .expect("turn stream event");
+
+        assert_eq!(
+            Some(2),
+            event.audio_chunk.and_then(|chunk| chunk.segment_seq)
+        );
+    }
+
+    #[test]
+    fn runtime_turn_stream_reads_frozen_m5_and_audio_chunk_timing_contract() {
+        let activity: RuntimeTurnStreamEvent = serde_json::from_str(
+            r#"{"type":"activity","callId":"call-1","traceId":"trace-1","turnId":"turn-1","activity":{"eventType":"tts_first_audio_chunk_ready","extension":{"streamTimingVersion":1,"streamAnchorId":"0123456789abcdef","streamAnchorServerDeltaMs":1200,"runtimeSessionNonceHash":"abcdef012345","segmentSeq":1,"streamTimingValidation":"bound"}}}"#,
+        )
+        .expect("m5 activity event");
+        let audio: RuntimeTurnStreamEvent = serde_json::from_str(
+            r#"{"type":"reply_audio_chunk","callId":"call-1","traceId":"trace-1","turnId":"turn-1","audioChunk":{"chunkSeq":1,"segmentSeq":1,"streamTimingVersion":1,"streamAnchorId":"0123456789abcdef","format":"pcm_s16le","payloadBase64":"AA==","last":false}}"#,
+        )
+        .expect("timed audio chunk event");
+
+        assert_eq!(Some("call-1"), activity.call_id.as_deref());
+        assert_eq!(Some("trace-1"), activity.trace_id.as_deref());
+        assert_eq!(Some("turn-1"), activity.turn_id.as_deref());
+        let extension = activity.activity.unwrap().extension.unwrap();
+        assert_eq!(Some(1), extension.stream_timing_version);
+        assert_eq!(Some(1200), extension.stream_anchor_server_delta_ms);
+        assert_eq!(
+            Some("0123456789abcdef"),
+            audio.audio_chunk.unwrap().stream_anchor_id.as_deref()
+        );
+    }
+
+    #[test]
+    fn runtime_turn_stream_timing_records_m6_and_m7_once_then_rejects_terminal_late_events() {
+        let nonce = "runtime-nonce";
+        let nonce_hash = runtime_session_nonce_hash(nonce);
+        let activity: RuntimeTurnStreamEvent = serde_json::from_str(&format!(
+            r#"{{"type":"activity","callId":"call-1","traceId":"trace-1","turnId":"turn-1","activity":{{"eventType":"tts_first_audio_chunk_ready","extension":{{"streamTimingVersion":1,"streamAnchorId":"0123456789abcdef","streamAnchorServerDeltaMs":1200,"runtimeSessionNonceHash":"{nonce_hash}","segmentSeq":1,"streamTimingValidation":"bound"}}}}}}"#,
+        ))
+        .expect("m5 activity event");
+        let audio: RuntimeTurnStreamEvent = serde_json::from_str(
+            r#"{"type":"reply_audio_chunk","callId":"call-1","traceId":"trace-1","turnId":"turn-1","audioChunk":{"chunkSeq":1,"segmentSeq":1,"streamTimingVersion":1,"streamAnchorId":"0123456789abcdef","format":"pcm_s16le","payloadBase64":"AA==","last":false}}"#,
+        )
+        .expect("timed audio chunk event");
+        let mut state = RuntimeTurnStreamState::default();
+
+        assert!(state.arm_timing_anchor("call-1", "trace-1", "turn-1", nonce, &activity));
+        let chunk = audio.audio_chunk.as_ref().expect("audio chunk");
+        assert!(
+            state
+                .record_m6("call-1", "trace-1", "turn-1", &audio, chunk)
+                .is_some()
+        );
+        assert!(
+            state
+                .record_m6("call-1", "trace-1", "turn-1", &audio, chunk)
+                .is_none()
+        );
+        assert!(state.record_m7().is_some());
+        assert!(state.record_m7().is_none());
+
+        state.close_timing();
+        assert_eq!(RuntimeTurnStreamTimingPhase::Closed, state.timing.phase);
+        assert!(state.timing.anchor.is_none());
+        assert!(!state.arm_timing_anchor("call-1", "trace-1", "turn-1", nonce, &activity));
+        assert!(
+            state
+                .record_m6("call-1", "trace-1", "turn-1", &audio, chunk)
+                .is_none()
+        );
+        assert!(state.record_m7().is_none());
+    }
+}

--
Gitblit v1.9.3