Claiming Foreign Income Exclusion in a year with both a foreign employer and as a remote independent contractor with US based clients still living abroad

I have lived abroad for 7 years and always filed the foreign income exclusion. This year, I worked the first two months abroad for a foreign employer, but then I started working remotely as an independent contractor for companies registered in the US, but I still resided abroad for the whole year and I qualify for the bona fide resident test. Does this mean all of my income is still excluded from US income tax? Or must I pay taxes on the independent contractor work since it is with companies registered in the  US? And if I do pay taxes for the independent contractor work with companies based in the US, can my income and bonuses with my foreign employer from the fist two months still be excluded?