dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fix: remove duplicate code block from merge conflict resolution in claude_code.rs

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-24 12:34:20 +00:00
parent 557b6e9267
commit 4611a187f1
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/llm/providers/claude_code.rs
View File

@@ -350,8 +350,6 @@ fn run_pty_session(
// Drain remaining lines // Drain remaining lines
while let Ok(Some(line)) = line_rx.try_recv() { while let Ok(Some(line)) = line_rx.try_recv() {
let trimmed = line.trim(); let trimmed = line.trim();
if let Ok(json) = serde_json::from_str::<serde_json::Value>(trimmed) {
process_json_event(&json, &token_tx, &msg_tx, &mut sid_tx);
if let Ok(json) = serde_json::from_str::<serde_json::Value>(trimmed) if let Ok(json) = serde_json::from_str::<serde_json::Value>(trimmed)
&& let Some(event_type) = && let Some(event_type) =
json.get("type").and_then(|t| t.as_str()) json.get("type").and_then(|t| t.as_str())