Merge remote-tracking branch 'origin/pr/1' into codex/merge-pr-1

Author: claude

core/src/llm/openai.rs

@@ -669,14 +669,9 @@ impl LlmClient for OpenAiClient {
                                                             as u64,
                                                     );
                                                 }
-                                                if let Some(delta) = Self::merge_stream_text(
-                                                    &mut text_content,
-                                                    &reasoning,
-                                                ) {
-                                                    let _ = tx
-                                                        .send(StreamEvent::ReasoningDelta(delta))
-                                                        .await;
-                                                }
+                                                let _ = tx
+                                                    .send(StreamEvent::ReasoningDelta(reasoning))
+                                                    .await;
                                             }
                                             if !skip_content {
                                                 if let Some(content) = message
@@ -720,13 +715,9 @@ impl LlmClient for OpenAiClient {
                                                             as u64,
                                                     );
                                                 }
-                                                if let Some(delta) =
-                                                    Self::merge_stream_text(&mut text_content, rc)
-                                                {
-                                                    let _ = tx
-                                                        .send(StreamEvent::ReasoningDelta(delta))
-                                                        .await;
-                                                }
+                                                let _ = tx
+                                                    .send(StreamEvent::ReasoningDelta(rc.clone()))
+                                                    .await;
                                             }
 
                                             if let Some(content) = delta.content {
@@ -840,11 +831,7 @@ impl LlmClient for OpenAiClient {
                                         first_token_ms =
                                             Some(request_started_at.elapsed().as_millis() as u64);
                                     }
-                                    if let Some(delta) =
-                                        Self::merge_stream_text(&mut text_content, &reasoning)
-                                    {
-                                        let _ = tx.send(StreamEvent::ReasoningDelta(delta)).await;
-                                    }
+                                    let _ = tx.send(StreamEvent::ReasoningDelta(reasoning)).await;
                                 }
                                 if !skip_content {
                                     if let Some(content) =
@@ -877,11 +864,7 @@ impl LlmClient for OpenAiClient {
                                         first_token_ms =
                                             Some(request_started_at.elapsed().as_millis() as u64);
                                     }
-                                    if let Some(delta) =
-                                        Self::merge_stream_text(&mut text_content, rc)
-                                    {
-                                        let _ = tx.send(StreamEvent::ReasoningDelta(delta)).await;
-                                    }
+                                    let _ = tx.send(StreamEvent::ReasoningDelta(rc.clone())).await;
                                 }
                                 if let Some(content) = delta.content {
                                     if first_token_ms.is_none() {

core/src/llm/tests.rs

@@ -1391,6 +1391,53 @@ mod extra_llm_tests2 {
         assert_eq!(message.reasoning_content.as_deref(), Some("done"));
     }
 
+    #[tokio::test]
+    async fn test_openai_stream_reasoning_delta_does_not_pollute_final_text() {
+        let sse = vec![
+            "data: {\"choices\":[{\"delta\":{\"reasoning\":\"I should answer the greeting.\"},\"finish_reason\":null}],\"usage\":null}\n\n".to_string(),
+            "data: {\"choices\":[{\"delta\":{\"content\":\"你好\"},\"finish_reason\":null}],\"usage\":null}\n\n".to_string(),
+            "data: {\"choices\":[{\"delta\":{},\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":1,\"completion_tokens\":1,\"total_tokens\":2}}\n\n".to_string(),
+            "data: [DONE]\n\n".to_string(),
+        ];
+
+        let client = OpenAiClient::new("key".to_string(), "glm-5.2".to_string())
+            .with_http_client(Arc::new(MockStreamingHttpClient { chunks: sse }));
+
+        let mut rx = client
+            .complete_streaming(
+                &[Message::user("你好")],
+                None,
+                &[],
+                CancellationToken::new(),
+            )
+            .await
+            .unwrap();
+
+        let mut text_deltas = String::new();
+        let mut reasoning_deltas = String::new();
+        let mut final_response = None;
+        while let Some(event) = rx.recv().await {
+            match event {
+                StreamEvent::TextDelta(delta) => text_deltas.push_str(&delta),
+                StreamEvent::ReasoningDelta(delta) => reasoning_deltas.push_str(&delta),
+                StreamEvent::Done(response) => {
+                    final_response = Some(response);
+                    break;
+                }
+                _ => {}
+            }
+        }
+
+        let response = final_response.expect("expected final response");
+        assert_eq!(text_deltas, "你好");
+        assert_eq!(reasoning_deltas, "I should answer the greeting.");
+        assert_eq!(response.text(), "你好");
+        assert_eq!(
+            response.message.reasoning_content.as_deref(),
+            Some("I should answer the greeting.")
+        );
+    }
+
     // ========================================================================
     // LlmConfig and create_client_with_config
     // ========================================================================