Skip to content

Report differing fields when an integration trace forks - #3219

Open
xeophon wants to merge 1 commit into
codex/3205-network-fixturefrom
codex/3205-branch-diagnostics
Open

xeophon wants to merge 1 commit into
codex/3205-network-fixturefrom
codex/3205-branch-diagnostics

Conversation

@xeophon

@xeophon xeophon commented Nov 19, 2026 •

Copy link
Copy Markdown
Member

Report the first pair of sibling nodes, their roles, and the names of differing fields when the one-branch assertion fails. This preserves the original assertion and keeps message contents out of CI logs.

Local unit suite on this commit reported 299 passed, 19 skipped. Full-stack CI before review fixes

Layer 12 of 13. Builds on #3218. Stack index

Note

Report differing fields in assert_one_branch when an integration trace forks

Improves the fork assertion in grid.py. When a trace has multiple branches, it now records the first node per parent and, on finding a sibling with the same parent, compares their message fields and tools. The failure message includes the parent, node indexes, roles, and the differing fields. Traces with one branch or no sibling pair still fail with the branch count.

Macroscope summarized a7601e9.


Note

Low Risk
Test-only assertion messaging change; production behavior and pass/fail criteria are unchanged except for richer failure output.

Overview
When integration rollouts unexpectedly fork, assert_one_branch now fails with actionable context instead of only reporting the branch count.

After the existing early exits for allowed harness forks and single-branch traces, it walks the trace tree to find the first sibling pair (two nodes with the same parent), compares their message model fields and tools, and reports the parent id, node indexes, roles, and names of differing fields—without dumping message contents into CI logs. If no sibling pair is found, it still fails with the branch count alone.

Reviewed by Cursor Bugbot for commit a7601e9. Bugbot is set up for automated code reviews on this repo. Configure here.

@macroscopeapp

macroscopeapp Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 46c75d3

Macroscope's review found this PR approvable — Unexpected integration-trace forks now report the sibling nodes and differing field names. The change is confined to test-failure diagnostics and does not affect production behavior.

Notes:

  • No code objects were reviewed. Approvability was decided on eligibility alone.

No code changes detected at a7601e9. Prior analysis still applies.

You can add or adjust custom eligibility rules. Learn more.

@xeophon
xeophon force-pushed the codex/3205-network-fixture branch from 7e0ed60 to ab7cdbe Compare November 19, 2026 01:30
@xeophon
xeophon force-pushed the codex/3205-branch-diagnostics branch from 46c75d3 to a7601e9 Compare November 19, 2026 01:30

This branch has not been deployed

No deployments
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.

1 participant