story-kit: merge 311_story_server_enforced_retry_limits_for_failed_merge_and_empty_diff_stories

.story_kit/project.toml

@@ -9,6 +9,10 @@ default_coder_model = "sonnet"
 # Maximum concurrent coder agents. Stories wait in 2_current/ when all slots are full.
 max_coders = 3
 
+# Maximum retries per story per pipeline stage before marking as blocked.
+# Set to 0 to disable retry limits.
+max_retries = 2
+
 [[component]]
 name = "frontend"
 path = "frontend"