The example I have top of mind is something like aws codeartifact login --tool pip ... and aws codeartifact login --tool npm ... I can simply do "C-r pi

The example I have top of mind is something like aws codeartifact login --tool pip ... and aws codeartifact login --tool npm ... I can simply do "C-r pip" to get to the first and "C-r npm" to get to the second (or cycle through any other matches, or if I frequently had a few, maybe do "C-r tool npm"): your suggestion sounds much worse in comparison.