fix: bugs at `grind => finish?`  (#10936)

This PR fixes issues in `grind => finish?` that were preventing
generated `grind` tactic scripts from being successfully replayed.
5 files changed