Repository navigation
Let Pickup continue work handed back after a Claim - #756
Merged
Merged
Conversation
Merged
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.
Summary
Pickup can continue started work after a deliberate Day shift hand-back. Complete label history must establish the last Claim and the later ready label; never-Claimed work remains passed over. All other Ready issue gates still apply.
Closes #617
Evidence
cargo test --test pickup_run a_handed_back_branch_is_continued_without_losing_interrupted_work -- --exactfailed: Pickup skipped the preserved branch and no PR was created.After: the same test passes and verifies the interrupted commit remains in the branch history.
cargo test --bin thirdshift ready::tests: 17 passed.cargo test --test pickup_run: 65 passed, including open-PR/base preservation, same-second ordering, repeated Claims, missing/out-of-order hand-backs, multi-page history, and recent relabel settling.cargo test: 1831 passed, 0 failed, 2 ignored across 43 test binaries.cargo check --all-targets,cargo clippy --all-targets -- -D warnings, andcargo fmt --checkpassed.Test seams
Search::first_ready) with in-memory GitHub/origin reads: started hand-backs, other readiness gates and settling.thirdshift pickupcommand with real git and fake GitHub/Harness: paginated label chronology and preserved branch/open-PR Continuation outcomes.Review coverage
Independent Standards and Spec reviews found 0 findings on each axis and each read all 8 changed files. No changed file was left unread on either axis. The reviews used
git diff main...HEAD, withmainpinned to7af795dc141b3bb64dea032c162bddc5adf5045a. Each axis's report and final files-read list are saved in.thirdshift-review-NyxGdX/standards.mdand.thirdshift-review-NyxGdX/spec.mdin the implementation worktree.Unaddressed findings
git diff 7af795dc141b3bb64dea032c162bddc5adf5045a...HEADand supporting code found no introduced Security findings. Reviewed label-history ordering and pagination, readiness gates, CLI argument handling, and Continuation branch/base selection against the relevant attack-class guidance and repository ADRs. The existing readiness tests (17) and hand-back-related integration tests (6) passed in a network-isolated, resource-limited sandbox.Security review outcome
No unaddressed introduced findings.
Merge Danger
Door: two-way
Reverting restores the previous eligibility rule; no migration or branch deletion.
Blast Radius: Pickup
The shared Ready issue search also controls when Architect and Security runs yield to shaped work. Claim coordination and Security fix exclusions stay in force.
Built with codex · gpt-6.1-sol · high