From 361f9dff0dc91b4c4e2e54607a1727a74f682687 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 28 Mar 2026 15:27:19 +0000 Subject: [PATCH] fix(426): also narrow pre-cherry-pick code change check to .storkit/work/ There were two places checking for code changes: the post-cherry-pick verification (already fixed) and a pre-cherry-pick check in the merge-queue worktree. The pre-cherry-pick check was still filtering all of .storkit/ which rejected stories that only change project.toml. Co-Authored-By: Claude Opus 4.6 (1M context) --- server/src/agents/merge.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/agents/merge.rs b/server/src/agents/merge.rs index 64b43e4b..2aa06a4b 100644 --- a/server/src/agents/merge.rs +++ b/server/src/agents/merge.rs @@ -247,7 +247,7 @@ pub(crate) fn run_squash_merge( .output() .map_err(|e| format!("Failed to check merge diff: {e}"))?; let changed_files = String::from_utf8_lossy(&diff_check.stdout); - let has_code_changes = changed_files.lines().any(|f| !f.starts_with(".storkit/")); + let has_code_changes = changed_files.lines().any(|f| !f.starts_with(".storkit/work/")); if !has_code_changes { all_output.push_str( "=== Merge commit contains only .storkit/ file moves, no code changes ===\n",