Thanks for the response... I ended up putting together the same patch to work with it now. The specific use case is in an app when you can resume old session (stored with SwiftData) but the available tools might change