Dave
81065a3ada
fix: replace fast-forward with cherry-pick in mergemaster squash-merge
...
The mergemaster pipeline used git merge --ff-only to apply the squash
commit from a merge-queue branch onto master. This raced with the
filesystem watcher which auto-commits pipeline file moves to master,
causing the fast-forward to fail. The mergemaster agent would then
improvise by manually moving stories to done without the code merge.
- Replace --ff-only with cherry-pick so concurrent watcher commits
don't block the merge
- Add report_merge_failure MCP tool for explicit failure handling
- Update mergemaster prompt to forbid manual file moves
- Fix cleanup_merge_workspace to handle stale directories
Squash merge of feature/story-205
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-26 14:16:35 +00:00
Dave
c435d86d1a
story-kit: queue 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code for merge
2026-02-26 14:15:12 +00:00
Dave
ea60db575d
story-kit: start 207_story_rename_llm_provider_labels_claude_pty_to_claude_code_anthropic_to_anthropic_api
2026-02-26 14:11:52 +00:00
Dave
d44648e169
story-kit: queue 202_story_make_agent_watchdog_interval_configurable_via_project_toml for QA
2026-02-26 14:11:21 +00:00
Dave
6a389d86ee
story-kit: create 207_story_rename_llm_provider_labels_claude_pty_to_claude_code_anthropic_to_anthropic_api
2026-02-26 14:11:20 +00:00
Dave
089287c8a2
story-kit: start 206_story_claude_pty_should_be_selected_by_default_on_first_use
2026-02-26 14:09:58 +00:00
Dave
50a3527828
story-kit: create 206_story_claude_pty_should_be_selected_by_default_on_first_use
2026-02-26 14:09:22 +00:00
Dave
af2fea81af
story-kit: queue 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code for QA
2026-02-26 14:07:51 +00:00
Dave
1491c6b811
story-kit: start 202_story_make_agent_watchdog_interval_configurable_via_project_toml
2026-02-26 13:56:05 +00:00
Dave
f37401697f
story-kit: start 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep
2026-02-26 13:55:59 +00:00
Dave
c51964d9f1
story-kit: start 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code
2026-02-26 13:51:08 +00:00
Dave
1966cb7cd5
story-kit: create 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code
2026-02-26 13:50:44 +00:00
Dave
9c0df59db0
story-kit: create 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code
2026-02-26 13:49:52 +00:00
Dave
181e49e0ec
story-kit: create 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code
2026-02-26 13:48:50 +00:00
Dave
c24301d60c
story-kit: create 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code
2026-02-26 13:45:40 +00:00
Dave
bf71151605
story-kit: done 204_story_rename_storkit_branding_to_story_kit
2026-02-26 12:52:01 +00:00
Dave
146a45a33e
story-kit: done 203_story_move_story_to_current_before_checking_agent_availability_in_start_agent
2026-02-26 12:46:07 +00:00
Dave
3a9790a277
story-kit: done 202_story_make_agent_watchdog_interval_configurable_via_project_toml
2026-02-26 12:36:35 +00:00
Dave
4cafc6f299
story-kit: done 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep
2026-02-26 12:27:32 +00:00
Dave
b86c50b2d5
story-kit: remove 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:20:27 +00:00
Dave
9a98e4b46e
story-kit: start 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:20:23 +00:00
Dave
78b05397b7
story-kit: accept 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:17:07 +00:00
Dave
2dbfd42c6e
story-kit: done 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:16:07 +00:00
Dave
f5f2716a3a
story-kit: remove 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:12:41 +00:00
Dave
69400f8eb9
story-kit: remove 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:12:40 +00:00
Dave
a489386f46
story-kit: merge 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:09:33 +00:00
Dave
cb3a804259
story-kit: done 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:09:20 +00:00
Dave
8d29956dea
story-kit: merge 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 12:05:08 +00:00
Dave
3c5b496432
story-kit: done 201_story_make_watcher_sweep_interval_configurable_via_project_toml
2026-02-26 12:00:04 +00:00
Dave
badb4edf96
story-kit: queue 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep for merge
2026-02-26 11:59:16 +00:00
Dave
8836bff7cb
story-kit: queue 199_story_web_ui_submits_all_queued_items_at_once for merge
2026-02-26 11:59:15 +00:00
Dave
b791304bb0
story-kit: queue 203_story_move_story_to_current_before_checking_agent_availability_in_start_agent for merge
2026-02-26 11:54:23 +00:00
Dave
39887eb0bf
story-kit: accept 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 11:04:43 +00:00
Dave
39d81812da
story-kit: done 199_story_web_ui_submits_all_queued_items_at_once
2026-02-26 11:04:43 +00:00
Dave
1d9a275e74
story-kit: queue 204_story_rename_storkit_branding_to_story_kit for merge
2026-02-26 11:04:37 +00:00
Dave
37a0ca50e5
story-kit: queue 202_story_make_agent_watchdog_interval_configurable_via_project_toml for merge
2026-02-26 11:04:05 +00:00
Dave
a5d6f4dd32
story-kit: done 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep
2026-02-26 11:00:39 +00:00
Dave
ff3360295d
story-kit: queue 204_story_rename_storkit_branding_to_story_kit for QA
2026-02-26 10:59:02 +00:00
Dave
004442e001
story-kit: queue 202_story_make_agent_watchdog_interval_configurable_via_project_toml for QA
2026-02-26 10:57:54 +00:00
Dave
b7a370dbc0
story-kit: queue 201_story_make_watcher_sweep_interval_configurable_via_project_toml for merge
2026-02-26 10:56:36 +00:00
Dave
6e88c639f6
story-kit: queue 203_story_move_story_to_current_before_checking_agent_availability_in_start_agent for QA
2026-02-26 10:55:53 +00:00
Dave
062d24abd6
story-kit: accept 193_story_clickable_code_references_in_frontend
2026-02-26 10:54:58 +00:00
Dave
ced1808049
story-kit: done 193_story_clickable_code_references_in_frontend
2026-02-26 10:53:58 +00:00
Dave
c9343152ab
story-kit: queue 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep for merge
2026-02-26 10:53:52 +00:00
Dave
9d00f77d86
story-kit: start 204_story_rename_storkit_branding_to_story_kit
2026-02-26 10:51:50 +00:00
Dave
7243bab7d5
story-kit: create 204_story_rename_storkit_branding_to_story_kit
2026-02-26 10:51:18 +00:00
Dave
7b1778a312
story-kit: queue 199_story_web_ui_submits_all_queued_items_at_once for merge
2026-02-26 10:49:13 +00:00
Dave
b2b1e7ed3d
story-kit: start 202_story_make_agent_watchdog_interval_configurable_via_project_toml
2026-02-26 10:48:24 +00:00
Dave
474814ead3
story-kit: queue 193_story_clickable_code_references_in_frontend for merge
2026-02-26 10:47:18 +00:00
Dave
ba9ea2a602
story-kit: start 203_story_move_story_to_current_before_checking_agent_availability_in_start_agent
2026-02-26 10:46:11 +00:00
