Repository navigation
Commit 3a94ff0
fix(session): address consensus review on the toolless flattening
Findings verified by execution before fixing; each was reproduced first.
- Consecutive assistant turns (Major #1). Removing the intervening `tool`
message left the ordinary agentic shape
`user -> assistant(call) -> tool(result) -> assistant(text) -> user` with two
adjacent assistant messages, contradicting the docstring's claim that role
alternation is preserved. Assistant turns now coalesce. Checked against the
live gateway: it accepts consecutive assistant messages, so this was a
correctness and documentation defect rather than a live failure.
- Title generation never reached the flattening (Major #2). `ensureTitle`
passed `tools: {}` without a `toolChoice`, so `addHistoricalToolStubs`
repopulated `tools` from tool parts in the context, `declaresNoTools` became
false, and the transform never ran. It now passes `toolChoice: "none"`, as
`compaction.ts` already did.
- `tool-result` parts embedded in an assistant message are flattened too
(Minor #3); they previously survived structurally intact.
- The blank-text filter no longer touches parts this transform did not create
(Minor #4). It was stripping the single space `message-v2.ts` preserves as a
separator between Anthropic signed-reasoning blocks.
- `content`-array tool output is unwrapped to its text instead of being
JSON-stringified (Minor #8), which also shrinks the flattened payload that
Minor #5 flagged as escaping the token estimate.
- The test docstring no longer claims OpenAI and Anthropic reject the shape
(Minor #9); they accept it, as the implementation and PR body already said.
Seven regression tests added, covering the canonical shape, the preserved
separator, embedded results, unwrapped content output, parallel calls, output
shapes with no `value`, and caller-input immutability. Mutation-checked:
disabling the merge fails 2, widening the blank filter fails 1.
Deferred, with reasons: marker escaping and output truncation (Minor #7) —
after the merge fix a call and its result are adjacent in one turn, so
ordering already carries correlation; `any` in the render helpers (NIT #10) —
deliberate glue for SDK shape variability. The `summary` agent named in the
PR description has no `Agent.get("summary")` call site anywhere in the tree,
so only compaction and title actually reach this code; the PR body is
corrected accordingly.
Co-Authored-By: Claude Opus 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01V4pzHPsqfbTdLMKzMaSYcF1 parent 1ca2491 commit 3a94ff0
3 files changed
Lines changed: 207 additions & 41 deletions
File tree
- packages/opencode
- src
- provider
- session
- test/provider
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
373 | | - | |
374 | | - | |
375 | | - | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
376 | 383 | | |
377 | 384 | | |
378 | 385 | | |
379 | | - | |
380 | | - | |
381 | | - | |
382 | | - | |
383 | | - | |
384 | | - | |
385 | | - | |
386 | | - | |
387 | | - | |
| 386 | + | |
388 | 387 | | |
389 | 388 | | |
390 | 389 | | |
391 | 390 | | |
392 | 391 | | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
393 | 395 | | |
394 | 396 | | |
395 | 397 | | |
396 | 398 | | |
397 | 399 | | |
398 | 400 | | |
399 | 401 | | |
400 | | - | |
401 | | - | |
402 | | - | |
403 | | - | |
404 | | - | |
405 | | - | |
406 | | - | |
407 | | - | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
408 | 415 | | |
409 | 416 | | |
410 | 417 | | |
| |||
422 | 429 | | |
423 | 430 | | |
424 | 431 | | |
425 | | - | |
426 | | - | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
427 | 440 | | |
428 | | - | |
429 | | - | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
430 | 444 | | |
431 | 445 | | |
432 | 446 | | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
433 | 459 | | |
434 | 460 | | |
435 | 461 | | |
| |||
438 | 464 | | |
439 | 465 | | |
440 | 466 | | |
441 | | - | |
442 | | - | |
443 | | - | |
444 | | - | |
445 | | - | |
446 | | - | |
447 | | - | |
448 | | - | |
| 467 | + | |
449 | 468 | | |
450 | 469 | | |
451 | 470 | | |
452 | | - | |
453 | | - | |
454 | | - | |
455 | | - | |
456 | | - | |
457 | | - | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
458 | 484 | | |
459 | 485 | | |
460 | 486 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4062 | 4062 | | |
4063 | 4063 | | |
4064 | 4064 | | |
| 4065 | + | |
| 4066 | + | |
| 4067 | + | |
| 4068 | + | |
| 4069 | + | |
4065 | 4070 | | |
4066 | 4071 | | |
4067 | 4072 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
82 | 83 | | |
83 | 84 | | |
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 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
85 | 220 | | |
0 commit comments