Allow Phase 2 memory claims after retry exhaustion#19809
Merged
Conversation
Collaborator
Author
|
@codex review |
Collaborator
Author
|
@codex review |
Contributor
|
Codex Review: Didn't find any major issues. 🎉 ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Why
The Phase 2 memories job row is only the global lock for the git-backed memory workspace. Manual memory edits do not enqueue new Stage 1 work, so a Phase 2 row with
retry_remaining = 0could be skipped before the worker ever claimed the lock and generatedphase2_workspace_diff.md.That left workspace-only changes unconsolidated after repeated failures, even when retry backoff had elapsed and the filesystem had real diffable work.
What Changed
try_claim_global_phase2_jobto claim the Phase 2 lock after the retry budget is exhausted, while still respecting activeretry_atbackoff and fresh running leases.SkippedRetryUnavailablefor Phase 2 as backoff-only, and update the outcome docs to match.Verification
phase2_global_lock_can_be_claimed_after_retry_budget_is_exhaustedto cover the exhausted-budget lock claim path.cargo test -p codex-state.