Earlier quoted context omitted.
I had the same problem with something so much more benign than that. I was a Green Card holder. Technically, you need your card and foreign passport to enter the country. I got yelled at for giving them my passport once, with the guard claiming it’s useless and not needed. So then I started having it on hand but not providing it on the spot, at which point I’d get yelled at for not providing the needed passport upfro…
My understanding is that the passport is not actually required at the CBP checkpoint if you present a valid unexpired green card. But yeah, there's no way different officers should be yelling contradictory things at you. Side note: A passport may still be required to board an inbound international flight even if I'm right about it not needing to accompany a green card at the CBP checkpoint, depending on the rules of…
That part of my life is behind me so now I get the next fun challenge: Which passport to use when going up to Canada and back as a dual citizen.