huskies: merge 868

server/src/agents/pool/pipeline/merge/runner.rs

@@ -114,16 +114,6 @@ impl AgentPool {
                     Err(e) => e.clone(),
                 };
                 let is_no_commits = reason.contains("no commits to merge");
-                if !is_no_commits {
-                    // Write merge_failure to content for non-blocking failures.
-                    if let Some(contents) = crate::db::read_content(&sid) {
-                        let updated = crate::io::story_metadata::write_merge_failure_in_content(
-                            &contents, &reason,
-                        );
-                        crate::db::write_content(&sid, &updated);
-                        crate::db::write_item_with_content(&sid, "4_merge", &updated);
-                    }
-                }
                 if is_no_commits {
                     if let Err(e) = crate::agents::lifecycle::transition_to_blocked(&sid, &reason) {
                         crate::slog_error!("[merge] Failed to transition '{sid}' to Blocked: {e}");
@@ -135,6 +125,14 @@ impl AgentPool {
                             reason,
                         });
                 } else {
+                    // Transition through the state machine (Merge → MergeFailure).
+                    if let Err(e) =
+                        crate::agents::lifecycle::transition_to_merge_failure(&sid, &reason)
+                    {
+                        crate::slog_error!(
+                            "[merge] Failed to transition '{sid}' to MergeFailure: {e}"
+                        );
+                    }
                     let _ = pool
                         .watcher_tx
                         .send(crate::io::watcher::WatcherEvent::MergeFailure {