Repository navigation
Conversation
Merge upstream master 6a641f3, including the architecture module-map and schedule-independent ranxianglei#2929 probe fixes. Preserve the existing PR head and exact contribution patch. Validation of this refreshed head runs in upstream CI; no local test rerun is claimed.
Owner
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
A sole same-size/MIME spill is currently assumed to be the outbound image. After rescaling, its encoded size can coincide with a different original's size, so the archive note sends the model to that other image. Missing sole spills also produce unusable restore refs.
Change
Remove the size-only fast return. Apply the existing readable-byte comparison to every candidate, including a single candidate. Exact matches, multiple entries for one ref, and ambiguity across refs retain their existing semantics. No image identity, storage, configuration or kernel format changes.
Verification
301e1a5459a77d5578206927c8062a58381af642.m22222in the red image's archive note. With the patch that unverified ref is omitted, the prior correct resize note remains, and readingm11111still restores the exact red original. Inbound history stays unchanged.npm run typecheck,npm run build, andgit diff --check: passed.127.0.0.1:8199is unreachable. The required real Codex four-phase acceptance remains a pre-merge gate and is not claimed as run.Related #6089 addresses incomplete spill repair, #3706 byte-budget shedding, and #5754 the archive cap. None verifies the sole candidate's content against the outgoing image.
Fixes #7035