huskies: merge 650_bug_watchdog_turns_used_and_budget_used_usd_accumulate_across_all_sessions_restart_counts_against_limits_from_prior_runs

server/src/agents/pool/pipeline/advance.rs

@@ -553,7 +553,11 @@ fn write_review_hold_to_store(story_id: &str) {
 /// Returns `Some(reason)` if the story is now blocked (caller should NOT restart the agent).
 /// Returns `None` if the story may be retried.
 /// When `max_retries` is 0, retry limits are disabled.
-fn should_block_story(story_id: &str, max_retries: u32, stage_label: &str) -> Option<String> {
+pub(crate) fn should_block_story(
+    story_id: &str,
+    max_retries: u32,
+    stage_label: &str,
+) -> Option<String> {
     use crate::io::story_metadata::{increment_retry_count_in_content, write_blocked_in_content};
 
     if max_retries == 0 {

server/src/agents/pool/pipeline/mod.rs

@@ -3,4 +3,5 @@ mod advance;
 mod completion;
 mod merge;
 
+pub(crate) use advance::should_block_story;
 pub(super) use completion::run_server_owned_completion;