fix(core): address some wonkiness when merging command and run-commands#21315

Merged

FrozenPandaz merged 2 commits intonrwl:masterfrom AgentEnder:fix/inconsistent-merging-algorithm

Jan 29, 2024

+201-128

Commits on Jan 28, 2024