Repository navigation
Commit da098a4
committed
fix(anthropic): allocate tool call ids per request instead of per id
Three defects, all reachable from the same history replay:
The raw-id fallback restored values the helper had deliberately refused.
`anthropicToolCallId("")` returns undefined precisely because an empty id is
not usable, and `?? rawId` put it back on the wire. An unrepresentable call now
becomes text and its result follows it there.
Result matching compared domains. `requiredIds` held normalized ids while the
result scan tested the raw `toolCallId`, so every rewritten pair lost its real
result to orphan text AND gained a synthetic missing-result block -- worse than
the bug it was meant to repair. Matching is now on the wire id, via a lookup
that never mints one, so a result with no call still stays orphan.
The transform was not injective despite saying it was. `call:a` maps to
`call_a_<hash>`, and a raw id already equal to that value conforms and passes
through unchanged: two sources, one wire id. Ordinary 32-bit hash collisions had
the same effect. Ids are now allocated by a request-scoped allocator that
reserves conforming ids first and appends a numeric suffix when a candidate is
taken.
Also adds the length bound the issue named. `isConformingToolCallId` now
includes it, so a character-valid but over-long id is rewritten rather than
reserved verbatim, and candidates are assembled as `prefix_hash` with the prefix
truncated -- slicing the finished string would have removed the discriminator.
Collision suffixes reserve their own space.
`src/adapters/google.ts` shares the allocator rather than aliasing the stateless
helper, which would have kept the collision defect there.
Regressions in tests/adapter-usage.test.ts drive the real buildRequest path:
rewritten pair stays paired, empty id never reaches the wire, rewritten id does
not collide with a conforming id equal to its normalized form, result-only id
mints nothing, over-length id is rewritten to fit, conforming pairs unchanged.1 parent 388c4c2 commit da098a4
5 files changed
Lines changed: 341 additions & 27 deletions
File tree
- src/adapters
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
560 | 560 | | |
561 | 561 | | |
562 | 562 | | |
563 | | - | |
| 563 | + | |
564 | 564 | | |
565 | 565 | | |
566 | 566 | | |
| |||
575 | 575 | | |
576 | 576 | | |
577 | 577 | | |
578 | | - | |
| 578 | + | |
579 | 579 | | |
580 | 580 | | |
581 | 581 | | |
582 | 582 | | |
583 | 583 | | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
584 | 589 | | |
585 | 590 | | |
586 | 591 | | |
| |||
593 | 598 | | |
594 | 599 | | |
595 | 600 | | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
596 | 614 | | |
597 | 615 | | |
598 | 616 | | |
| |||
646 | 664 | | |
647 | 665 | | |
648 | 666 | | |
649 | | - | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
650 | 674 | | |
651 | 675 | | |
652 | 676 | | |
| |||
664 | 688 | | |
665 | 689 | | |
666 | 690 | | |
667 | | - | |
668 | | - | |
669 | | - | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
670 | 698 | | |
671 | 699 | | |
672 | 700 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
98 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
99 | 102 | | |
100 | 103 | | |
101 | 104 | | |
| |||
158 | 161 | | |
159 | 162 | | |
160 | 163 | | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
161 | 174 | | |
162 | 175 | | |
163 | 176 | | |
| |||
196 | 209 | | |
197 | 210 | | |
198 | 211 | | |
199 | | - | |
| 212 | + | |
200 | 213 | | |
201 | 214 | | |
202 | 215 | | |
| |||
221 | 234 | | |
222 | 235 | | |
223 | 236 | | |
224 | | - | |
| 237 | + | |
| 238 | + | |
225 | 239 | | |
226 | 240 | | |
227 | 241 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
5 | 43 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
13 | 49 | | |
14 | | - | |
15 | | - | |
| 50 | + | |
| 51 | + | |
16 | 52 | | |
17 | 53 | | |
18 | 54 | | |
19 | 55 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
25 | 119 | | |
0 commit comments