A middle ground could be to add the change Id as a git note? But that would probably result in tooling needed to get a good UX flow.