Repository navigation
P757: keep re-sent orders open until a later merge - #2162
Merged
Merged
Conversation
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.
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.
P757 — reject merges older than the current order
Corrects my deletion in #2153.
PullRequest.merged_commits(since: float)requires an order time.MergedPullRequestalone decidesmerged_at >= since;MergedProgress.foundpassessource.since. No default, consumer comparison, alternate timestamp, or compatibility path.Also restores the missing
MaintenanceBarrierimport used byTodoStore.writer_connectionon current main. Without it the requested CLI cannot even create an order.Source evidence
origin/mainat verification start:26f680338; head9a7b19e5b1e00d6a47729c2dc8725b4110bdaa72.tree_sitteris missing.MergedPullRequest. The othermerged_commits(repo)methods belong toOrderDelivery, notPullRequest, and retain their separate contract.Verification — NOT a passing merge gate
timeout 300batch, shared Core Python,PYTHONPATH=src,--no-cov -n 2, both requested files: 96 passed, 36 failed in 98.56s, rc 1. Both new re-sent-order cases passed. No assertion was weakened, skipped or xfailed.archive_infobeing decoded as VCS-onlyDistributionSource, existing clock/stall assertions, checkout assertions and a stale mocked argument count. Runtime owner was contacted; it has no available checkout and knows no active fixer for the metadata defect. This PR must not be represented as passing either suite.origin/main: rc 0/0, no introduced findings.agent-comms-commander order boardjourney passed with real local Git merges and controlled externalghresponses. It creates the first order, performs an old merge, sends a replacement order, verifies that old merge leaves the new order open, performs a later merge and verifies closure with the first declaration preserved.Output:
/home/ts/.cache/agent-scratch/p35-main-show-once-20261017/P757/merge-after-order/cli-fixed.log; detailed resultcli/result.jsonin the same directory. Source evidence and suite/ratchet logs are also there. The old scratch application's use of an already-merged public PR is superseded, not claimed as proof.Assumed: equality qualifies as ordered; controlled external forge responses are suitable for this private CLI check; the separate delivery API is unchanged.
Not merged: the required suite gate remains red.