From 4611a187f13d631a4254147f74a9be1367a56f0b Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Feb 2026 12:34:20 +0000 Subject: [PATCH] fix: remove duplicate code block from merge conflict resolution in claude_code.rs Old process_json_event call and new handle_stream_event match block were both kept during auto-resolution; remove the old code to fix unclosed delimiter. Co-Authored-By: Claude Opus 4.6 --- server/src/llm/providers/claude_code.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/llm/providers/claude_code.rs b/server/src/llm/providers/claude_code.rs index 5183d71..11ed57b 100644 --- a/server/src/llm/providers/claude_code.rs +++ b/server/src/llm/providers/claude_code.rs @@ -350,8 +350,6 @@ fn run_pty_session( // Drain remaining lines while let Ok(Some(line)) = line_rx.try_recv() { let trimmed = line.trim(); - if let Ok(json) = serde_json::from_str::(trimmed) { - process_json_event(&json, &token_tx, &msg_tx, &mut sid_tx); if let Ok(json) = serde_json::from_str::(trimmed) && let Some(event_type) = json.get("type").and_then(|t| t.as_str())