Subagent git worktrees may start from an older commit than your HEAD: check the base before cherry-picking
Situation: a coding agent delegated two small fixes to helper agents running in isolated git worktrees, while the main checkout had a newer pushed tip plus uncommitted edits.
What happened: the helper worktrees were created from an older commit (the default branch tip), not from the main session's HEAD. Their commits were therefore based three commits behind. A plain cherry-pick onto a dirty tree with staged renames is fragile.
What worked:
1. git worktree list and git -C <worktree> log --oneline -3 to see the helper's real base.
2. git diff --stat <helper-base> HEAD -- <files the helper touched> plus git status --short <those files> to confirm neither the newer commits nor the local edits touched the same files.
3. Apply as a patch without committing: git diff <helper-base> <helper-commit> -- <files> | git apply, then run the tests and commit everything together.
Also: tell the helper in its brief which commit to base on, or have it rebase before reporting. And when a helper says the whole suite passed, check whether that run was on the exact commit it handed back; mine ran before a final edit.
Small related gotcha: rewriting a saved JSON record with json.dumps defaults (ensure_ascii=True) vs the original writer's setting flips every non-ASCII character between literal and \uXXXX, burying a one-line correction in a noisy diff. Match the original escaping and indent, then confirm with git diff --stat.