Repository navigation
Commit f3bdcb6
fix(acp): compactions during prompt preparation and from ACP v1 agents resend T3 notes
T3 read the compaction mark before preparing the prompt's text and
attachments. A root compaction that finished during that preparation
left the prompt without instructions or runtime notes, so both arrived
one prompt late. Delivery state is now read after those awaits.
T3 also never advertised ACP v1 compaction support. Conforming v1 agents
only send compaction_update to clients that advertise it, and this PR
resends notes only after an observed compaction, so their later prompts
would have dropped the notes for good. initialize now advertises
`session.compaction: {}` next to `notices`. The recorded Fx and Grok
initialize frames follow.
The late-prompt rollback test now waits on a new afterPromptCallback
test hook, so it fails if the stale prompt's delivery write is not
generation checked.
Co-Authored-By: Claude Opus 5.5 <[email protected]>1 parent a6966ef commit f3bdcb6
19 files changed
Lines changed: 116 additions & 68 deletions
File tree
- apps/server/src/orchestration-v2
- Adapters
- testkit/fixtures
- fx_early_stop
- fx_subagent
- grok_auto_blocked_command
- grok_background_bash_fast_wake
- grok_background_bash
- grok_prompt_error
- message_steering
- multi_turn
- queued_turn
- simple
- todo_list
- tool_call_denied_write
- tool_call_read_only_on_request
- turn_interrupt
- packages
- effect-acp/src
- provider-acp/src/server
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
| 353 | + | |
353 | 354 | | |
354 | 355 | | |
355 | 356 | | |
356 | 357 | | |
357 | 358 | | |
358 | 359 | | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
359 | 367 | | |
360 | 368 | | |
361 | 369 | | |
| |||
430 | 438 | | |
431 | 439 | | |
432 | 440 | | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
433 | 448 | | |
434 | 449 | | |
435 | 450 | | |
| |||
1078 | 1093 | | |
1079 | 1094 | | |
1080 | 1095 | | |
1081 | | - | |
| 1096 | + | |
1082 | 1097 | | |
1083 | 1098 | | |
1084 | | - | |
1085 | | - | |
1086 | | - | |
1087 | | - | |
1088 | | - | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
| 1103 | + | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
1089 | 1108 | | |
1090 | 1109 | | |
1091 | 1110 | | |
| |||
1166 | 1185 | | |
1167 | 1186 | | |
1168 | 1187 | | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
1169 | 1200 | | |
1170 | 1201 | | |
1171 | 1202 | | |
| |||
2253 | 2284 | | |
2254 | 2285 | | |
2255 | 2286 | | |
2256 | | - | |
| 2287 | + | |
2257 | 2288 | | |
2258 | 2289 | | |
2259 | 2290 | | |
| |||
3554 | 3585 | | |
3555 | 3586 | | |
3556 | 3587 | | |
| 3588 | + | |
3557 | 3589 | | |
3558 | 3590 | | |
3559 | 3591 | | |
3560 | 3592 | | |
| 3593 | + | |
| 3594 | + | |
| 3595 | + | |
| 3596 | + | |
3561 | 3597 | | |
3562 | 3598 | | |
3563 | 3599 | | |
| |||
3645 | 3681 | | |
3646 | 3682 | | |
3647 | 3683 | | |
3648 | | - | |
3649 | | - | |
| 3684 | + | |
| 3685 | + | |
3650 | 3686 | | |
| 3687 | + | |
3651 | 3688 | | |
3652 | 3689 | | |
3653 | 3690 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
0 commit comments