feat: apply debug logging improvements from stash