From 5e5c5a0e08b44790288015cc6d8e674f8b55d1ee Mon Sep 17 00:00:00 2001 From: Timmy Date: Thu, 14 May 2026 10:57:37 +0100 Subject: [PATCH] revert: remove temporary merge-reap diagnostic logging Reverts the diagnostic introduced in 91b4e4ff. Will re-add when we actively debug the disappearance bug again. --- server/src/agents/pool/pipeline/merge/runner.rs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/server/src/agents/pool/pipeline/merge/runner.rs b/server/src/agents/pool/pipeline/merge/runner.rs index 426a3d07..e6337759 100644 --- a/server/src/agents/pool/pipeline/merge/runner.rs +++ b/server/src/agents/pool/pipeline/merge/runner.rs @@ -39,23 +39,10 @@ impl AgentPool { if job.status != "running" { continue; } - let decoded = decode_server_start_time(job.error.as_deref()); - let stale = match decoded { + let stale = match decode_server_start_time(job.error.as_deref()) { Some(t) => t < current_boot, None => true, // Legacy (pid-encoded) or malformed: stale }; - // DIAGNOSTIC: log the values being compared so we can see why - // fresh jobs are being marked stale. Remove once the disappearance - // bug is understood. - slog!( - "[merge-reap] job='{}' status='{}' error={:?} decoded={:?} current_boot={} stale={}", - job.story_id, - job.status, - job.error, - decoded, - current_boot, - stale, - ); if stale { slog!( "[merge] Cleared stale Running merge job for '{}' (server restarted) — re-dispatching",