Merging parent context with partitions

I have a use case with tap-clickup where a stream has a parameter that we need to call for archived where we need to call (and paginate) archived=true and archived=false. This stream is also a Child stream that needs the parents ID.

This line of code shows where using both contexts and partitions together doesn't work https://gitlab.com/meltano/sdk/-/blob/v0.4.6/singer_sdk/streams/core.py#L934

We could merge these two together like I did here https://github.com/AutoIDM/tap-clickup/blob/main/tap_clickup/client.py#L126 and https://github.com/AutoIDM/tap-clickup/blob/main/tap_clickup/client.py#L114 . The problem with this implementation is my state gets messed up when it comes to incremental streams.