fix: recover claims after explicit pinned base correction - #33
Merged
Conversation
added 2 commits
August 26, 2026 10:46
Resolves the one real conflict: src/weftmark/application/task_claims.py's _finish() intent-match guard, where main's task-claim-scope-amendment-recovery fix (subset scope check) and this branch's base-revision-compatibility fix both touched the same condition. Combined both: _base_revision_is_compatible() for the base check, task_scopes.issubset(change_set_scopes) for the scope check (not this branch's original exact-equality, which would have reintroduced the scope-amendment recovery bug already fixed on main). Verified: 8/8 tests in tests/application/test_task_claims.py pass together (both fixes' regression tests), full suite 550/550, validate_tasks.py clean.
tabenius
marked this pull request as ready for review
September 5, 2026 13:43
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
tabenius
pushed a commit
that referenced
this pull request
Sep 5, 2026
Native task and Frog task both closed 2026-09-05 after merging main (19db3f7, 7-task subagent-driven-development process: per-task reviews, a final whole-branch review, one fix wave, a scoped re-review, all clean) and PR #33 (which the closeout depended on for native claim recovery). 550/550 tests, validate_tasks.py clean.
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
1 participant
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.
Summary\n- allow an expired native claim to recover after an explicit, auditable ChangeSet rebase\n- retain strict task identity, scope, and claim-owner checks\n- reject revision-label changes without a recorded base rebase\n\n## Verification\n- .................... [100%]
20 passed in 0.79s (20 passed)\n- validated 81 tasks across 12 files
topological roots: repo-bootstrap (81 tasks)\n-