Merge branch 'claudedo/a76d9547ab4a41538b42de79a2c90299'

tests/ClaudeDo.Data.Tests/PromptFilesTests.cs

@@ -96,6 +96,34 @@ public class PromptFilesTests
         Assert.Contains("Do not act on any single task before you have read", d);
     }
 
+    [Fact]
+    public void DefaultFor_merge_helper_allows_splitting_bundled_tasks_in_phase_2()
+    {
+        var d = PromptFiles.DefaultFor(PromptKind.MergeHelper);
+        Assert.Contains("Propose splitting it to the user", d);
+        Assert.Contains("add_task/add_subtask", d);
+        Assert.Contains("do not invent requirements", d);
+    }
+
+    [Fact]
+    public void DefaultFor_merge_helper_checks_effective_max_turns_before_queuing()
+    {
+        var d = PromptFiles.DefaultFor(PromptKind.MergeHelper);
+        Assert.Contains("effective max-turns", d);
+        Assert.Contains("get_list_config", d);
+        Assert.Contains("set_task_config", d);
+        Assert.Contains("get_task_config", d);
+    }
+
+    [Fact]
+    public void DefaultFor_merge_helper_checks_file_collisions_before_merge_order()
+    {
+        var d = PromptFiles.DefaultFor(PromptKind.MergeHelper);
+        Assert.Contains("Default to the order the brief lists them", d);
+        Assert.Contains("tell the user which tasks collide", d);
+        Assert.Contains("NORMAL case, not a failure", d);
+    }
+
     [Fact]
     public void DefaultFor_merge_helper_initial_has_repo_token()
     {