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
The Codex catalog wrapper captures an entry per request. A concurrent 401/403 can invalidate the shared cache while an older request still holds that entry. The older request can replay stale metadata or republish it after reading its body. A previously started atomic rename can also land after invalidation deleted the file, reviving the catalog across a factory restart.
Change
Associate each credential-scoped cache key with a bounded generation token and advance it on invalidation. Check that token before fallback, revalidation, writes, and invalidation so an old request cannot modify a later generation. Sequence only disk mutations for the same key, ensuring deletion follows any already-started rename. Network requests and unrelated credentials remain concurrent. Original upstream responses still reach their callers.
Validation
301e1a5459a77d5578206927c8062a58381af642.npm run typecheck,npm run build, andgit diff --check: passed.Prior work
#3996 introduced the cache, #4864 rejected unconditional 304, and #6145 verifies conditional validators. Their behaviors and existing tests remain intact. Live issue/PR searches and author history were checked for the new concurrency defect.
Fixes #7019