Commit Graph

1177 Commits

Author SHA1 Message Date
Dave
21cf318fc0 story-kit: done 210_bug_pipeline_moves_story_to_done_even_when_mergemaster_reports_merge_failure 2026-02-26 15:47:14 +00:00
Dave
5ce2ec8c34 story-kit: queue 213_story_remove_colored_left_border_from_work_item_cards for QA 2026-02-26 15:42:21 +00:00
Dave
d6b4e47b65 story-kit: queue 211_story_skip_selection_screen_when_cli_path_argument_provided for QA 2026-02-26 15:41:24 +00:00
Dave
94136d648f story-kit: queue 210_bug_pipeline_moves_story_to_done_even_when_mergemaster_reports_merge_failure for merge 2026-02-26 15:39:01 +00:00
Dave
bf6a96a2d5 story-kit: start 213_story_remove_colored_left_border_from_work_item_cards 2026-02-26 15:35:13 +00:00
Dave
b8ad2d4f4e story-kit: create 213_story_remove_colored_left_border_from_work_item_cards 2026-02-26 15:34:29 +00:00
Dave
6bf7ba605e story-kit: queue 210_bug_pipeline_moves_story_to_done_even_when_mergemaster_reports_merge_failure for QA 2026-02-26 15:33:20 +00:00
Dave
32a9ef779a story-kit: create 212_bug_permission_hook_returns_invalid_response_blocking_edit_and_write_tools 2026-02-26 15:31:50 +00:00
Dave
60278064c8 story-kit: start 211_story_skip_selection_screen_when_cli_path_argument_provided 2026-02-26 15:29:25 +00:00
Dave
93877fb6f2 story-kit: create 211_story_skip_selection_screen_when_cli_path_argument_provided 2026-02-26 15:29:22 +00:00
Dave
f854deaedc story-kit: start 210_bug_pipeline_moves_story_to_done_even_when_mergemaster_reports_merge_failure 2026-02-26 15:18:24 +00:00
Dave
6a2fbaf2ed story-kit: create 210_bug_pipeline_moves_story_to_done_even_when_mergemaster_reports_merge_failure 2026-02-26 15:14:10 +00:00
Dave
69dc664bd5 story-kit: done 209_story_accept_optional_positional_path_argument_on_startup 2026-02-26 15:09:39 +00:00
Dave
0be7bcd8ae story-kit: done 208_bug_project_scaffold_does_not_write_mcp_json_to_project_root 2026-02-26 14:59:03 +00:00
Dave
40d96008c9 feat(story-200): auto-prune worktrees when stories are archived
- Add `prune_worktree_sync` to worktree.rs: removes a story's worktree
  if it exists, delegating to `remove_worktree_sync` (best-effort,
  failures logged internally)
- Update `sweep_done_to_archived` to accept `git_root` and call
  `prune_worktree_sync` after promoting a story from 5_done to 6_archived
- Add Part 2 to the sweep: scan 6_archived and prune any stale worktrees
  for stories already there (catches items archived before this feature)
- All worktree removal failures are logged but never block file moves
- Add 5 new tests: prune noop, prune real worktree, sweep-on-promote,
  sweep-stale-archived, sweep-not-blocked-by-removal-failure

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-26 14:58:52 +00:00
Dave
4e535dff18 story-kit: start 208_bug_project_scaffold_does_not_write_mcp_json_to_project_root 2026-02-26 14:26:24 +00:00
Dave
bf809d9879 story-kit: queue 207_story_rename_llm_provider_labels_claude_pty_to_claude_code_anthropic_to_anthropic_api for merge 2026-02-26 14:26:14 +00:00
Dave
2e40cfcc44 story-kit: start 209_story_accept_optional_positional_path_argument_on_startup 2026-02-26 14:25:58 +00:00
Dave
113b2500fa story-kit: done 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep 2026-02-26 14:25:27 +00:00
Dave
3d0c97167c story-kit: create 209_story_accept_optional_positional_path_argument_on_startup 2026-02-26 14:24:31 +00:00
Dave
29c5b3898b story-kit: create 208_bug_project_scaffold_does_not_write_mcp_json_to_project_root 2026-02-26 14:24:24 +00:00
Dave
4f878a0ee7 story-kit: queue 206_story_claude_pty_should_be_selected_by_default_on_first_use for QA 2026-02-26 14:23:38 +00:00
Dave
3aa639b5b4 story-kit: queue 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep for merge 2026-02-26 14:22:23 +00:00
Dave
7d4fd8bc0d story-kit: done 202_story_make_agent_watchdog_interval_configurable_via_project_toml 2026-02-26 14:21:32 +00:00
Dave
8fc5cd263f story-kit: queue 207_story_rename_llm_provider_labels_claude_pty_to_claude_code_anthropic_to_anthropic_api for QA 2026-02-26 14:21:21 +00:00
Dave
864421dc75 story-kit: queue 202_story_make_agent_watchdog_interval_configurable_via_project_toml for merge 2026-02-26 14:17:43 +00:00
Dave
557229fd9e story-kit: done 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code 2026-02-26 14:17:26 +00:00
Dave
bf5cc860b4 story-kit: queue 200_story_auto_prune_worktrees_for_archived_stories_in_watcher_sweep for QA 2026-02-26 14:17:05 +00:00
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