b9a62f6590
`repair_message_sequence` registers BOTH `id` and `call_id` for each assistant tool_call, because a matching tool result may be keyed on either depending on which path built it (#58168). The duplicate guard added for dropped rather than replayed. Those two behaviours don't compose: a Codex/Responses tool_call registers two DIFFERENT ids (`fc_...` and `call_...`), but only the id the first result referenced is discarded. Its sibling stays in `known_tool_ids`, so a duplicate result keyed on that sibling still matches and is kept — two tool messages replayed for one call, which is exactly the HTTP 400 on strict providers the consume step exists to prevent. Duplicates of this kind come from the retry / crash / session-resume glitch the guard was written for; the id-variant split just lets them slip past it. Track each registered id back to its tool_call's full variant set and discard all of them on a match. Results keyed on either variant are still accepted (no false orphaning), and two parallel Codex calls answered via different variants both survive. Adds regression tests for the sibling-keyed duplicate and for the two-calls/mixed-keys case that must NOT be affected.