Is there a Debt-Limit Deal?

No.

There isn't a deal until there's a deal.

Until the President and the Speaker say "We Have a Deal" (Reid and McConnell will do as they're told), we do not have a deal.

And since we do not have one until it exists, its pointless speculating about what's in it. We will not know until we can see for  ourselves who has stood, and who is screwed.