Simplify parallel branch merge coordination #554

Merged
weichen merged 9 commits from feature/merge-queue-simple-policy into main 2026-10-14 17:32:40 +00:00
Owner

Why: Multiple branches were repeatedly syncing a moving main, resolving the same conflicts, and rerunning final CI before they were actually next to merge.

Evidence: At dfd608b1cf9101999a075e88f2dccc6862fa2a03, make test and make build passed from source-out SELF receipts. Scope, relative-link, diff, and recursive worktree checks passed. Independent Review found no remaining findings after correcting one stale anchor, the final-window conflict owner, and the evidence wording. The PR HEAD still requires the platform's test, test-pg, and svc-realcombo checks.

Impact: Waiting branches keep developing without chasing main. One task at a time gets the final window to sync once, resolve conflicts, run exact-head checks and Review, and be merged by the agent. Card-close PRs use the same queue. This change does not add writer audits, a second trial, platform or runner changes, automatic locking, fencing, or business-task takeover. No additional operational monitoring is required because this changes delivery documentation only.

Refs: Agent-System-Dev #518

Why: Multiple branches were repeatedly syncing a moving main, resolving the same conflicts, and rerunning final CI before they were actually next to merge. Evidence: At `dfd608b1cf9101999a075e88f2dccc6862fa2a03`, `make test` and `make build` passed from source-out SELF receipts. Scope, relative-link, diff, and recursive worktree checks passed. Independent Review found no remaining findings after correcting one stale anchor, the final-window conflict owner, and the evidence wording. The PR HEAD still requires the platform's `test`, `test-pg`, and `svc-realcombo` checks. Impact: Waiting branches keep developing without chasing main. One task at a time gets the final window to sync once, resolve conflicts, run exact-head checks and Review, and be merged by the agent. Card-close PRs use the same queue. This change does not add writer audits, a second trial, platform or runner changes, automatic locking, fencing, or business-task takeover. No additional operational monitoring is required because this changes delivery documentation only. Refs: Agent-System-Dev #518
weichen added 4 commits 2026-10-14 16:53:31 +00:00
Why: establish the authorized task workspace and its initial baseline.

Evidence: preserved precheck receipt in .task/feature-merge-queue-simple-policy.md; R0=33261925a10c4eee40d1b6175b3895e78a47ef02.

Impact: task metadata only; the feature workspace starts at 33261925a1.

Refs: .task/feature-merge-queue-simple-policy.md
Why: Keep branches developing independently and serialize only final sync, validation, and agent merge without expanding into audits or new platform mechanisms.

Evidence: scope and link checks, git diff --check, and recursive worktree verification passed as SELF evidence in the task card.

Impact: Documentation only; existing task-sync, CI, branch protection, and agent merge behavior remain unchanged.

Refs: Agent-System-Dev #518
Why: Freeze the queue attempt and exact base before final validation.

Evidence: task-sync returned changed=0 on base 33261925; Issue #518 comment 6408 records the window.

Impact: Task record only; policy content is unchanged.

Refs: Agent-System-Dev #518
Clarify final-window ownership and evidence
ci / svc-realcombo (pull_request) Successful in 2m11s
ci / test (pull_request) Successful in 5m29s
ci / test-pg (pull_request) Successful in 8m27s
dfd608b1cf
Why: Keep final sync and conflict handling with the merge agent and avoid treating pre-freeze SELF checks as final evidence.

Evidence: Review found one stale anchor, one ownership ambiguity, and one evidence-scope overclaim; all three are corrected.

Impact: Documentation only; no runtime or platform behavior changes.

Refs: Agent-System-Dev #518
weichen added 2 commits 2026-10-14 17:04:35 +00:00
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=b8edf13dc7b818d6e61b829f6e88202ec553f2fc.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
Record the sync checkpoint
ci / test (pull_request) Successful in 6m18s
ci / svc-realcombo (pull_request) Successful in 2m32s
ci / test-pg (pull_request) Successful in 7m59s
4272d55c7b
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=b8edf13dc7b818d6e61b829f6e88202ec553f2fc; before_record=e2d796ff7e92da5f7bc593a4af240645198e8551.

Impact: task metadata only.

Refs: .task/feature-merge-queue-simple-policy.md
weichen added 3 commits 2026-10-14 17:23:18 +00:00
Why: Preserve the one changed-base sync before freezing the final candidate.

Evidence: task-sync merged main b8edf13 without conflicts and reported tested checkpoint 4272d55.

Impact: Task record only; policy content and runtime behavior are unchanged.

Refs: Agent-System-Dev #518 #554
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=803a73e5d6621f7b5aac792f81f0fd449bd00be2.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
Record the sync checkpoint
ci / svc-realcombo (pull_request) Successful in 1m54s
ci / test (pull_request) Successful in 5m4s
ci / test-pg (pull_request) Successful in 7m30s
2668bf14f5
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=803a73e5d6621f7b5aac792f81f0fd449bd00be2; before_record=fb888430d0c7e9c8a133a880fbad1d51215f5b27.

Impact: task metadata only.

Refs: .task/feature-merge-queue-simple-policy.md
weichen merged commit b6da086eb8 into main 2026-10-14 17:32:40 +00:00
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: weichen/Agent-System-Dev#554