From 93576e3f83dd354a0693ca0683252627bb01b08e Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 28 Mar 2026 14:21:57 +0000 Subject: [PATCH] fix(426): narrow merge verification exclude to .storkit/work/ only The post-cherry-pick diff check was excluding all of .storkit/, which rejected stories whose deliverable is .storkit/project.toml changes (e.g. 431 updating QA agent prompts). Narrow the exclusion to .storkit/work/ which is where pipeline file moves live. Co-Authored-By: Claude Opus 4.6 (1M context) --- server/src/agents/merge.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/agents/merge.rs b/server/src/agents/merge.rs index 88a7790e..64b43e4b 100644 --- a/server/src/agents/merge.rs +++ b/server/src/agents/merge.rs @@ -419,9 +419,10 @@ pub(crate) fn run_squash_merge( } // Verify HEAD commit has actual code changes (not an empty cherry-pick). - // Exclude .storkit/ so that story-file-only commits don't pass this check. + // Exclude .storkit/work/ (pipeline file moves) but keep .storkit/project.toml + // and other config files which are legitimate deliverables. let diff_stat = Command::new("git") - .args(["diff", "--stat", "HEAD~1..HEAD", "--", ".", ":(exclude).storkit"]) + .args(["diff", "--stat", "HEAD~1..HEAD", "--", ".", ":(exclude).storkit/work"]) .current_dir(project_root) .output() .map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())