Skip to content

fix: backport 0.12.1 steer batch (#32396 with its ordering fix #32826) - #32886

Merged
buluoray merged 2 commits into
release/0.12.0from
crew/slack/0.12.1-batch-steer-order
Nov 8, 2026
Merged

buluoray merged 2 commits into
release/0.12.0from
crew/slack/0.12.1-batch-steer-order

Conversation

@buluoray

@buluoray buluoray commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Problem / Motivation

Goal: Bring #32396 and its ordering fix #32826, both merged on main, onto release/0.12.0 together, one commit each, in a PR of their own.

Why it matters

PR Area What a 0.12.0 user sees today
#32396 chat After a quiet end, a steer the turn requeues leaves the backend's placeholder text saved as an assistant row above the real answer
#32826 chat With #32396 alone, on codex the held reply to a pending steer replays after the tool rows, so the transcript is out of order

#32396 was dropped from batch 45 (#32653) because of the ordering bug #32826 fixes. They ship together so the release never carries one without the other.

Not a goal

  • No fix that is not already merged on main; nothing is changed only here.
  • No version bump, no tag, no CHANGELOG.md change.

What changed (motivation → approach → change)

Each main squash commit was cherry-picked with -x onto release/0.12.0 @ 2e1fff086c, in merge order on main. Both applied cleanly, with no prerequisite and no hand-resolved hunk; each commit's added and removed lines are identical to its main commit.

# PR main commit release commit
1 #32396 drop post-quiet-end text held for a steer the turn requeues 2e0c482d4e 2f840a594b
2 #32826 send held steer text before the next tool call 9777445d5b 1d34b7ae0f

builder-security checked: each change is the one already merged on main; no bind, listener, new route, auth mechanism or storage grant is added.

Backwards compatibility

Compatible: each change is the one already merged on main, and its compatibility note applies unchanged. #32826's known trade-off carries over: in the rare turn whose steer is never echoed, text written before a tool call is kept.

Removes nothing: no setting, key or caller is removed.

Tests

Proof: not provable -- other: a backport of main commits whose proofs ran on their own PRs

  • CI does not run the backend suite on PRs into release/*, so the related set was run here: test_nothing_to_do_directive.py (both PRs' tests), test_chat_runner_turn_plumbing.py, test_chat_runner_composition*.py and the test_*steer*.py files, -n 4 --dist loadgroup. 1366 passed, 2 failed. The 2, in test_folder_steering_provider_dedup.py, fail the same way on a clean release/0.12.0 @ 2e1fff086c on this host.
  • flake8 passes on the changed Python files.
  • git merge-tree against the open batch fix: backport 0.12.1 wide batch 3 (15 user-facing fixes) #32836, which also touches chat_runner.py and session.md, reports no conflict.

Manual verification

N/A - each fix was verified on its own main PR. The 0.12.1 RC soak is the end-to-end check.

Related Issues

Backport to the 0.12 line for 0.12.1 of #32396 and #32826. #32396 was held back from #32653 for this pairing.

Sibling sweep

Siblings: none -- each source PR carried its own sibling sweep; this PR only carries those fixes.

Pattern harvest

Not generalizable: this PR only carries fixes already on main. The source PRs have their own harvest.

Checklist

  • At most two commits (one is the norm), with a Conventional Commits title (feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert: ...)
  • Existing tests pass and new tests added for new functionality
  • Self-review completed; code follows project style guidelines
  • Documentation updated (if applicable)
  • No secrets, credentials, or internal references in the diff

Contribution License Agreement

Contributions are accepted under the project's Apache-2.0 license; see the Licensing section of CONTRIBUTING.md.

bolichen97 and others added 2 commits November 8, 2026 03:17
)

A turn that ended on nothing_to_do kept every later text chunk once a
person's steer was pending, because it might answer them. When the turn
then ended without the backend's consumption echo, the steer was
requeued and answered by its own turn, and the kept text (in the field,
the backend's alternation placeholder) was saved as an assistant row
above the real answer.

Such text is now held instead of streamed. The consumption echo
releases it through the normal text path; a turn that ends without the
echo leaves it dropped and counted in the turn-end contract warning.

Closes #27655

(cherry picked from commit 2e0c482)
After a quiet end, text that arrives while a person's steer is pending
is held until the backend echoes the steer's consumption (codex does
that only at the terminal). Tool rows after that text rendered live,
so the released text was replayed after all of them and the saved
transcript was out of order.

The text held so far now goes out just before the next tool call, so
the transcript keeps the model's order and every tool event still runs
live. Text written before a tool call is the model's work, so it is
kept even if the echo never comes; only text with no tool call after
it stays held and is dropped then.

Refs #32396

(cherry picked from commit 9777445)
@buluoray
buluoray requested review from a team and KiroCrewCaptain as code owners November 8, 2026 03:20
@buluoray
buluoray requested review from Zedmor and removed request for a team November 8, 2026 03:20
@github-actions github-actions Bot added the readiness: checking Automated validation is still running label Nov 8, 2026
@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

UX Review (Opus 5.5) — ⏭️ skipped

Revision 1d34b7ae0fd326d13300f5df0b08d02973ed6442 touches no user-facing surface (no changes under website/ or committed screenshots), so the UX review was skipped. Does not block merge.

@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Design Review (Opus 5.5) — ✅ PASS

Design-level review of 1d34b7ae0fd326d13300f5df0b08d02973ed6442 — updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

Design-Verdict: PASS

Nothing blocks: this is a clean backport of two fixes already merged on main, carried together so the release never ships the ordering bug without its fix.

Notes

[DESIGN-REVIEWED] 1d34b7a

Description read

[DESCRIPTION-READ] e453bc63641de188ec873b54b73f8d42c2e33689af492181bc5e86b5d66ccdf0

That sha256 names everything this verdict read: the PR description, plus the 1 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with .github/scripts/pr-description-capture.sh over the same inputs; if it differs, the description or that evidence changed after this verdict was formed and any finding drawn from either is unproven.

@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

First Principles Review (Opus 5.5) — ✅ PASS

Premise-level review of 1d34b7ae0fd326d13300f5df0b08d02973ed6442 — why this exists and whether the shipped surface is the smallest honest version. Updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

First-Principles-Verdict: PASS

This backports two fixes already merged on main, and nothing in it goes beyond them. Each behaviour change is pinned by a test this PR adds.

What this change ships

Inventory (7 items) — 6 justified

Intent: give 0.12.x users a chat transcript after a quiet end where a pending steer leaves no placeholder reply and keeps the model's order. FIX.

  1. After a quiet end, late text that arrives while a person's steer is pending is held instead of shown at once — justified
  2. Held text streams as the reply when the backend confirms it consumed the steer — justified
  3. A turn that ends and requeues the steer without that confirmation drops the held placeholder; no assistant row is saved and the text is only counted — justified
  4. Held text goes out just before the next tool call renders, so the transcript keeps the model's order — justified
  5. On codex, which confirms the steer only at the end, the reply shows up when the turn ends instead of streaming in — undeclared
  6. Text written before a tool call is kept even when the steer is never confirmed (a stated trade-off) — justified
  7. The session.md spec documents the hold/release contract — justified

[FIRST-PRINCIPLES-REVIEWED] 1d34b7a

Description read

[DESCRIPTION-READ] d55c3e3e550281cdc3da5a583aec58dcfc086ae357e19c31b841f667a2ace17b

That sha256 names the PR description this verdict read. Recompute it with .github/scripts/pr-description-capture.sh; if it differs, the description changed after this verdict was formed and any finding drawn from the description is unproven.

@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Opus 5.5 Review — ✅ no blocking findings

Reviewed 1d34b7ae0fd326d13300f5df0b08d02973ed6442 — this comment is updated in place on each push.

Review details

No findings.

[OPUS-REVIEWED] 1d34b7a

Verdict parsed from the review's SHA-scoped output markers for commit 1d34b7ae0fd326d13300f5df0b08d02973ed6442.

False positive or not applicable? A repository writer can comment:
/ai-review override fable 1d34b7ae0fd326d13300f5df0b08d02973ed6442 false-positive: <reason, 20 to 500 characters>

@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

GPT 6.1 Review — ✅ no blocking findings

GPT 6.1 completed its review of 1d34b7ae0fd326d13300f5df0b08d02973ed6442 and found no blocking issues.

This comment is updated in place on each push.

Review details

No findings.
[GPT-REVIEWED] 1d34b7a

False positive or not applicable? A repository writer can comment:
/ai-review override gpt 1d34b7ae0fd326d13300f5df0b08d02973ed6442 false-positive: <reason, 20 to 500 characters>

@buluoray
buluoray merged commit 22bbd54 into release/0.12.0 Nov 8, 2026
21 of 23 checks passed
@buluoray
buluoray deleted the crew/slack/0.12.1-batch-steer-order branch November 8, 2026 03:31
@github-actions github-actions Bot removed the readiness: checking Automated validation is still running label Nov 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants