From 57407aed514cf3cbaad677453ea4d4e4f5122810 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 28 Mar 2026 10:09:41 +0000 Subject: [PATCH] storkit: create 426_bug_mergemaster_pipeline_marks_story_done_without_verifying_code_landed_on_master --- ..._without_verifying_code_landed_on_master.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.storkit/work/1_backlog/426_bug_mergemaster_pipeline_marks_story_done_without_verifying_code_landed_on_master.md b/.storkit/work/1_backlog/426_bug_mergemaster_pipeline_marks_story_done_without_verifying_code_landed_on_master.md index 73d50954..fa96b1c0 100644 --- a/.storkit/work/1_backlog/426_bug_mergemaster_pipeline_marks_story_done_without_verifying_code_landed_on_master.md +++ b/.storkit/work/1_backlog/426_bug_mergemaster_pipeline_marks_story_done_without_verifying_code_landed_on_master.md @@ -21,6 +21,24 @@ When manually cherry-picking 422 onto master, two conflicts arose: Additionally, the cherry-pick could not proceed at all because master was on the `merge-queue/424` branch with 3 unresolved files (notifications.rs, ws.rs, watcher.rs). A concurrent in-progress merge left the working tree dirty, which likely caused the original cherry-pick to fail silently. This suggests a race condition: the filesystem watcher commits (story file moves) can leave master in a state where the cherry-pick step in merge.rs fails. +## Full Audit of Done Stories (2026-03-28) + +Audited all 9 stories in `5_done/` to check whether their code actually landed on master: + +| Story | Merge Commit | Code on Master | +|-------|-------------|----------------| +| 417 — Split matrix/bot.rs | `665c036` (9 files, +1973/-1926) | YES | +| 418 — Split pool/auto_assign.rs | `d375c4b` (7 files, +1901/-1813) | YES | +| 419 — Matrix bot network error | `1193b7a` (1 file, +121/-3) | YES | +| 420 — loc file command | `d6f8239` (5 files, +112/-32) | YES | +| 421 — Timer command | `cf5424f` (7 files, +836) | YES | +| 422 — Unblock command | `6c6bc35` (4 files, +336) — manual cherry-pick | YES | +| **423 — Auto-schedule timer on rate limit** | **None** | **NO** | +| **424 — Rate limit traffic light** | **None** | **NO** | +| 425 — Chat notification on story block | `98b5475` (5 files, +184/-15) | YES | + +**3 out of 9 stories (422, 423, 424) had broken merges.** 422 was fixed manually. 423 and 424 still have code stranded on their feature branches with no merge commit on master. + ## Actual Result Story moved to done with no code on master. The merge-queue commit exists on a detached branch but was never applied to master. No merge commit appears in git log on master.