Skip to content

P757: keep re-sent orders open until a later merge - #2162

Merged
trissim merged 2 commits into
mainfrom
fix/p757-merge-after-order
Oct 20, 2026
Merged

trissim merged 2 commits into
mainfrom
fix/p757-merge-after-order

Conversation

@trissim

@trissim trissim commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

P757 — reject merges older than the current order

Corrects my deletion in #2153. PullRequest.merged_commits(since: float) requires an order time. MergedPullRequest alone decides merged_at >= since; MergedProgress.found passes source.since. No default, consumer comparison, alternate timestamp, or compatibility path.

Also restores the missing MaintenanceBarrier import used by TodoStore.writer_connection on current main. Without it the requested CLI cannot even create an order.

Source evidence

  • Base origin/main at verification start: 26f680338; head 9a7b19e5b1e00d6a47729c2dc8725b4110bdaa72.
  • Before/after Python AST inventory: 483 modules, no parse omissions. This is source evidence, not dynamic binding proof; the full NRA parser is unavailable because tree_sitter is missing.
  • Required comparison occurs once, in MergedPullRequest. The other merged_commits(repo) methods belong to OrderDelivery, not PullRequest, and retain their separate contract.

Verification — NOT a passing merge gate

  • Background timeout 300 batch, 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.
  • Initial batch exposed main's missing maintenance import: 30 passed, 85 failed, 17 errors. The import repair preceded the second batch.
  • Remaining failures include installed Toad archive_info being decoded as VCS-only DistributionSource, 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.
  • Source/tools ratchets against the above origin/main: rc 0/0, no introduced findings.
  • Actual private agent-comms-commander order board journey passed with real local Git merges and controlled external gh responses. 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.
  • Times: old merge 1792481579.0 < current order 1792481579.1346617 < new merge 1792481583.0.
  • No original bus/provider input, installed package, or GitHub merge was altered by the CLI check. This proves the source-overlay CLI path, not an installed build or real GitHub response.

Output: /home/ts/.cache/agent-scratch/p35-main-show-once-20261017/P757/merge-after-order/cli-fixed.log; detailed result cli/result.json in 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.

@trissim
trissim marked this pull request as ready for review October 20, 2026 08:00
Copilot AI balanced review requested due to automatic review settings October 20, 2026 08:00
@trissim
trissim merged commit 77fae55 into main Oct 20, 2026
0 of 3 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants