Upstream advanced 86d4e6298 -> 4f8dce1f62
(v7.5.0: PR #1300 single Dockerfile + extra CA bundle, #1207 Z.ai provider,
#1309 OpenAI-family cache layout, TZ2 Presence work), which left PR #1150
CONFLICTING on GitHub.
One textual conflict, tests/test_reference_book_budgets.py: upstream's
chapter-08 budget (22000, measured 21921 on its own tree) does not cover the
merged chapter, measured 22454 = upstream's Docker subsection + this PR's
533-byte platform-gate sentence. Upstream's rationale block is kept and the
budget is raised minimally to 22500 with the PR's rationale re-stated on top.
docs/architecture/08-git-branching-ci-and-build.md itself auto-merged
(different paragraphs, no text touched).
No upstream change since 86d4e6298 touched claudexor-platform-gate.yml,
scripts/claudexor_toolchain_smoke.py, ouroboros/claudexor_runtime.py, the
runtime pin, size_ratchet_manifest.py or the claudexor tests; those files are
byte-identical to a5fa2c998 here. DOMAIN_MAP.md and the generated inventories
already match the merged tree, so nothing was regenerated.
1f537e1f80