Repository navigation
Commit 6e221ea
committed
fix(acp): old-style diffs keep their own file next to Git patches
The client diff parser splits only at `diff --git` headers once the patch
contains one. An oldText/newText section after a Git patch had its hunk
attached to that file, and one before a Git patch was dropped.
Give those sections a Git header when another section has one. Output with
no Git patch is unchanged.1 parent 56b5838 commit 6e221ea
2 files changed
Lines changed: 43 additions & 5 deletions
File tree
- apps/server/src/orchestration-v2/Adapters
- packages/provider-acp/src/server
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
373 | 373 | | |
374 | 374 | | |
375 | 375 | | |
| 376 | + | |
376 | 377 | | |
377 | 378 | | |
378 | 379 | | |
| |||
381 | 382 | | |
382 | 383 | | |
383 | 384 | | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
384 | 410 | | |
385 | 411 | | |
386 | 412 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1095 | 1095 | | |
1096 | 1096 | | |
1097 | 1097 | | |
1098 | | - | |
| 1098 | + | |
1099 | 1099 | | |
1100 | 1100 | | |
1101 | 1101 | | |
| |||
1112 | 1112 | | |
1113 | 1113 | | |
1114 | 1114 | | |
1115 | | - | |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
1116 | 1118 | | |
1117 | 1119 | | |
1118 | | - | |
| 1120 | + | |
1119 | 1121 | | |
1120 | 1122 | | |
1121 | 1123 | | |
| |||
1133 | 1135 | | |
1134 | 1136 | | |
1135 | 1137 | | |
1136 | | - | |
| 1138 | + | |
1137 | 1139 | | |
1138 | | - | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
1139 | 1151 | | |
1140 | 1152 | | |
1141 | 1153 | | |
| |||
0 commit comments