The v6 "3+ conflicts -> STUCK" guard measured every conflict_resolver
attempt at the tier, including failed/blocked/errored ones. A burst of
transient worker errors (e.g. the run-9 marker false-positive) inflated
the count so that a workflow whose conflict was genuinely resolved on
the first real pass was routed to STUCK instead of IMPLEMENTING.
_count_conflict_resolver_attempts now counts only complete+resolved
attempts -- each resolved attempt is exactly one conflict cycle, since
the workflow leaves CONFLICT_RESOLVING on success and only re-enters
when a new conflict appears. Failed attempts are retries of the same
unresolved conflict and stay bounded by the pickup guard.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
drew
14f79ee61b