7faacb6664
huskies: merge 773
2026-04-28 10:24:04 +00:00
83f7e41932
huskies: merge 780
2026-04-28 10:19:38 +00:00
0c2789b2c1
huskies: merge 768
2026-04-28 10:12:27 +00:00
fb5a21cfbb
huskies: merge 778
2026-04-28 10:01:10 +00:00
d2d5ef8afa
huskies: merge 764
2026-04-28 09:54:47 +00:00
3d986a733b
huskies: merge 763
2026-04-28 09:42:59 +00:00
8a51dbd2ed
huskies: merge 765
2026-04-28 09:33:23 +00:00
38e828979c
huskies: merge 766
2026-04-28 08:59:13 +00:00
0d14fffe1c
huskies: merge 762
2026-04-28 01:31:16 +00:00
de5b585157
huskies: merge 761
2026-04-28 01:11:07 +00:00
70aaffc2ab
huskies: merge 777
2026-04-28 00:33:14 +00:00
d1a2393b32
huskies: merge 760
2026-04-28 00:22:29 +00:00
63ce7b9ec3
huskies: merge 759
2026-04-28 00:07:04 +00:00
9b24c2e281
huskies: merge 743
2026-04-27 23:48:53 +00:00
bf1393fa60
huskies: merge 741
2026-04-27 23:44:32 +00:00
7ee542dd1e
huskies: merge 757
2026-04-27 23:36:56 +00:00
dffa05d703
huskies: merge 689
2026-04-27 23:30:55 +00:00
571a057f52
huskies: merge 688_refactor_decompose_server_src_crdt_snapshot_rs_1182_lines
2026-04-27 22:42:48 +00:00
225c4f2b46
huskies: merge 758
2026-04-27 22:21:00 +00:00
03738f35f5
huskies: merge 687_refactor_decompose_server_src_crdt_sync_server_rs_1186_lines
2026-04-27 22:16:08 +00:00
574df48ff3
huskies: merge 686_refactor_decompose_server_src_io_watcher_rs_1202_lines
...
Manual merge resolution: feature branch deleted watcher.rs and split
into watcher/{mod,events,sweep,tests}.rs, while master modified the
old watcher.rs (738's FS-shadow stripping). The auto-resolver kept
both, producing an ambiguous-module compile error.
Resolution: drop watcher.rs (feature's delete wins). The new
watcher/mod.rs absorbs the FS-shadow code semantically — gates pass
(cargo check, clippy --all-targets -D warnings, fmt --check, 29/29
io::watcher tests).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
2026-04-27 21:55:04 +00:00
be7b7025d5
huskies: merge 742_refactor_read_rpc_frame_multiplexer_on_crdt_sync_websocket
2026-04-27 21:27:10 +00:00
88f9e5dd54
huskies: merge 731_refactor_migrate_existing_stories_from_slug_based_ids_to_numeric_only
2026-04-27 20:42:21 +00:00
1388658ae8
huskies: merge 730_story_use_numeric_only_story_ids_across_mcp_worktrees_git_branches_and_log_paths
2026-04-27 20:22:47 +00:00
63d5a500de
huskies: merge 670_refactor_hoist_chat_history_persistence_into_a_shared_module_replaces_658
2026-04-27 20:09:44 +00:00
615e1c7f73
huskies: merge 738_refactor_delete_fs_shadow_code_from_lifecycle_rs_and_the_work_directory_watcher
2026-04-27 19:56:53 +00:00
63a30a9319
huskies: merge 736_story_drain_and_prepend_buffered_status_events_on_the_user_s_next_agent_message
2026-04-27 19:37:39 +00:00
aa7b26a24a
huskies: merge 728_story_cryptographic_peer_handshake_with_trusted_keys_gating
2026-04-27 19:22:55 +00:00
ded8c6fd66
huskies: merge 685_refactor_decompose_server_src_config_rs_1223_lines
2026-04-27 19:16:25 +00:00
26f9f3f7fc
huskies: merge 729_story_store_story_name_as_a_crdt_field_separate_from_the_story_id
2026-04-27 19:09:56 +00:00
4aadf4aa47
huskies: merge 684_refactor_decompose_server_src_http_agents_rs_1249_lines
2026-04-27 18:49:53 +00:00
4b64bc614f
huskies: merge 726_story_notify_chat_transports_when_oauth_account_swaps_or_all_accounts_are_exhausted
2026-04-27 18:44:47 +00:00
80661fa622
huskies: merge 727_story_ed25519_node_identity_keypair_generation_persistence_and_identity_endpoint
2026-04-27 18:37:58 +00:00
b008235d0d
huskies: merge 683_refactor_decompose_server_src_agents_pool_start_mod_rs_1329_lines
2026-04-27 18:26:31 +00:00
646dc490b8
huskies: merge 720_refactor_add_mesh_status_mcp_tool_read_only_peer_mesh_diagnostics
2026-04-27 18:18:51 +00:00
c6bc6f07f7
huskies: merge 725_story_auto_swap_oauth_account_on_rate_limit
2026-04-27 18:12:57 +00:00
272a592a4d
huskies: merge 735_story_attach_statuseventbuffer_to_each_agent_session_scoped_per_project_reset_on_restart
2026-04-27 18:06:11 +00:00
d654f55981
huskies: merge 682_refactor_decompose_server_src_agents_merge_squash_rs_1346_lines
2026-04-27 17:58:04 +00:00
101f616346
huskies: merge 719_refactor_stale_merge_job_lock_recovery_on_new_merge_attempts
2026-04-27 17:46:49 +00:00
1ecb4dad55
huskies: merge 724_story_per_account_oauth_credential_storage_with_login_pool
2026-04-27 17:40:53 +00:00
ed8646f0d9
huskies: merge 681_refactor_decompose_server_src_agents_pool_pipeline_advance_mod_rs_1509_lines
2026-04-27 17:35:17 +00:00
875096b3ec
huskies: merge 718_refactor_stale_agent_claims_time_out_claim_ttl_with_displacement
2026-04-27 17:26:51 +00:00
fce7e16811
huskies: merge 716_story_statuseventbuffer_bounded_per_instance_buffer_over_services_status_broadcaster
2026-04-27 17:03:12 +00:00
4a0f57478c
huskies: merge 671_refactor_migrate_pipeline_state_consumers_from_string_comparisons_to_typed_pipelinestage_enum
2026-04-27 16:39:39 +00:00
39a9766d7d
huskies: merge 677_refactor_reject_promotion_to_current_coder_of_work_items_with_junk_only_acceptance_criteria
2026-04-27 16:30:35 +00:00
6a582d73b6
huskies: merge 675_bug_mergemaster_silently_exits_when_feature_branch_has_zero_commits_ahead_of_master
2026-04-27 14:43:54 +00:00
ea872fa01c
huskies: merge 676_bug_apply_and_persist_silently_drops_ops_when_persist_channel_send_fails
2026-04-27 14:38:11 +00:00
cbb0a50729
huskies: merge 649_story_migrate_whatsapp_transport_to_status_broadcaster
2026-04-27 14:19:19 +00:00
6c8043d866
huskies: merge 648_story_migrate_discord_transport_to_status_broadcaster
2026-04-27 14:01:32 +00:00
9040d18f50
huskies: merge 664_story_crdt_lamport_clock_inner_seq_must_resume_from_max_own_author_seq_1_instead_of_resetting_to_1_on_restart_phase_c
2026-04-27 12:30:44 +00:00
dave