Dave 4611a187f1 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 <noreply@anthropic.com>

2026-02-24 12:34:20 +00:00

..

http

story-kit: merge 86_story_show_live_activity_status_instead_of_static_thinking_indicator_in_chat

2026-02-24 12:32:14 +00:00

io

story-kit: merge 121_story_test_coverage_io_watcher_rs

2026-02-23 23:55:09 +00:00

llm

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

2026-02-24 12:34:20 +00:00

agent_log.rs

story-kit: accept 96_story_reset_agent_lozenge_to_idle_state_when_returning_to_roster

2026-02-23 20:52:06 +00:00

agents.rs

story-kit: merge 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master

2026-02-23 23:22:24 +00:00

config.rs

feat(story-93): expose server logs to agents via get_server_logs MCP tool

2026-02-23 20:38:19 +00:00

log_buffer.rs

feat(story-93): expose server logs to agents via get_server_logs MCP tool

2026-02-23 20:38:19 +00:00

main.rs

story-kit: merge 117_story_show_startup_reconciliation_progress_in_ui

2026-02-23 22:50:57 +00:00

state.rs

moved from tauri to a server with embedded UI

2026-02-13 12:31:36 +00:00

store.rs

WIP: Batch 1 — backfill tests for store, search, and workflow

2026-02-19 13:49:33 +00:00

workflow.rs

Spike 61: filesystem watcher and UI simplification

2026-02-20 19:39:19 +00:00

worktree.rs

story-kit: merge 128_story_test_coverage_worktree_rs

2026-02-24 00:26:49 +00:00