dave ce94dd0af4 refactor: split agents/merge.rs into mod.rs + squash.rs + conflicts.rs ...

The 1772-line merge.rs is split into:

- conflicts.rs: try_resolve_conflicts + resolve_simple_conflicts + tests (351 lines)
- squash.rs: run_squash_merge orchestrator + cleanup + run_merge_quality_gates + tests (1306 lines)
- mod.rs: doc, types (MergeJobStatus, MergeJob, MergeReport, SquashMergeResult), re-exports (52 lines)

Tests stay co-located.

No behaviour change. All 20 merge tests pass; full suite green
(2635 tests with --test-threads=1).

2026-04-26 21:15:06 +00:00

..

agents

refactor: split agents/merge.rs into mod.rs + squash.rs + conflicts.rs

2026-04-26 21:15:06 +00:00

chat

huskies: merge 641_story_unified_status_update_delivery_across_chat_web_ui_and_top_level_agent_context

2026-04-26 02:27:34 +00:00

crdt_state

refactor: split crdt_state.rs into 6 sub-modules with co-located tests

2026-04-26 20:54:15 +00:00

crdt_sync

refactor: split crdt_sync.rs into auth/wire/server/dispatch/client modules

2026-04-26 20:36:40 +00:00

db

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

http

refactor: split http/mcp/story_tools.rs into 5 sub-modules by item type

2026-04-26 21:11:09 +00:00

io

refactor: split io/fs/scaffold.rs into 4 sub-modules with co-located tests

2026-04-26 21:00:31 +00:00

llm

huskies: merge 608_story_extract_io_and_anthropic_services

2026-04-24 15:54:50 +00:00

service

huskies: merge 643_story_web_ui_consumer_for_the_unified_status_broadcaster

2026-04-26 11:30:32 +00:00

agent_log.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

agent_mode.rs

huskies: merge 641_story_unified_status_update_delivery_across_chat_web_ui_and_top_level_agent_context

2026-04-26 02:27:34 +00:00

config.rs

huskies: merge 643_story_web_ui_consumer_for_the_unified_status_broadcaster

2026-04-26 11:30:32 +00:00

crdt_snapshot.rs

huskies: merge 636_story_full_crdt_snapshot_compaction_with_cross_node_coordination

2026-04-26 01:19:05 +00:00

crdt_wire.rs

huskies: merge 631_story_crdt_delta_sync_via_vector_clocks_replace_full_bulk_dumps

2026-04-25 21:32:39 +00:00

gateway.rs

huskies: merge 617_story_split_gateway_into_service_and_transport

2026-04-24 18:43:26 +00:00

log_buffer.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

main.rs

huskies: merge 641_story_unified_status_update_delivery_across_chat_web_ui_and_top_level_agent_context

2026-04-26 02:27:34 +00:00

mesh.rs

huskies: merge 637_story_peer_mesh_discovery_via_crdt_node_presence_list

2026-04-26 01:57:31 +00:00

node_identity.rs

huskies: merge 602_spike_node_identity_keypair_foundation_for_distributed_huskies

2026-04-25 14:03:59 +00:00

pipeline_state.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

rebuild.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

services.rs

huskies: merge 641_story_unified_status_update_delivery_across_chat_web_ui_and_top_level_agent_context

2026-04-26 02:27:34 +00:00

state.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

store.rs

huskies: merge 542_refactor_add_doc_comments_to_all_undocumented_source_files_and_generate_source_map_in_readme

2026-04-12 13:16:11 +00:00

workflow.rs

fix: add --all to cargo fmt in script/test and autoformat codebase

2026-04-13 14:07:08 +00:00

worktree.rs

huskies: merge 643_story_web_ui_consumer_for_the_unified_status_broadcaster

2026-04-26 11:30:32 +00:00