Close three trial task cards and fix long-history detection #538

Merged
weichen merged 2 commits from feature/card-close-merge-queue-trial-20261014 into main 2026-10-14 05:08:40 +00:00
Owner

Why: On a long merge history, git log | grep -q and git log | grep | head -1 could return 141 under pipefail after a recent card match. Precheck then omitted merged cards, and task-close could skip their backfill.

Result: Consume the full merge-log output before deciding a match. Archive and mark complete only the three authorized trial cards for Dev #489, #488, and #486, each with its actual merge SHA. Four other currently eligible cards remain untouched.

Evidence: A disposable long-history test failed before the fix and passed after it (/tmp/mq-card-close-long-history-{red,green}-20261014-01.json). SELF make test-governance passed 341 cases; same-base make task-sync left this fixed HEAD unchanged. Independent REPLAY /root/merge_queue_review passed exact head 2221a099b7e15d7bdf9face8d0cddffb63901f01 (/tmp/mq-dev-three-cards-independent-review-20261014.json). Final exact-head Dev CI is pending and required before merge.

Impact: Reliable merged-card reporting and scoped bookkeeping closure; no product code, component pin, live service, or branch-protection change.

Refs: Dev queue #518; Dev #489/#488/#486; Documents trial report #101.

Final admission: fixed head 2221a099b7e15d7bdf9face8d0cddffb63901f01 / base 05b997b84db26c517604c48d12676f0eb2b86e18; independent /root/merge_queue_review REPLAY PASS (/tmp/mq-dev-three-cards-independent-review-20261014.json). GATE run 3069 actor weichen, home-runner/id3, all jobs and steps completed/success: svc-realcombo, test, test-pg. Root will merge with fixed head and force_merge=false; actual result follows read-back.

实际交付:Root经PR合入 4f84c2e1630cd0311643529fae1c3a99f1dd5d64,完整树及组件核验匹配固定候选;GATE run3069 actor weichen/home-runner id3,三项必需作业及步骤全部成功。源码外原始收据和独立报告保留,任务卡归档/回收另行完成,状态见Issue518。

Why: On a long merge history, `git log | grep -q` and `git log | grep | head -1` could return 141 under `pipefail` after a recent card match. Precheck then omitted merged cards, and task-close could skip their backfill. Result: Consume the full merge-log output before deciding a match. Archive and mark complete only the three authorized trial cards for Dev #489, #488, and #486, each with its actual merge SHA. Four other currently eligible cards remain untouched. Evidence: A disposable long-history test failed before the fix and passed after it (`/tmp/mq-card-close-long-history-{red,green}-20261014-01.json`). SELF `make test-governance` passed 341 cases; same-base `make task-sync` left this fixed HEAD unchanged. Independent REPLAY `/root/merge_queue_review` passed exact head `2221a099b7e15d7bdf9face8d0cddffb63901f01` (`/tmp/mq-dev-three-cards-independent-review-20261014.json`). Final exact-head Dev CI is pending and required before merge. Impact: Reliable merged-card reporting and scoped bookkeeping closure; no product code, component pin, live service, or branch-protection change. Refs: Dev queue #518; Dev #489/#488/#486; Documents trial report #101. <!-- mq-trial-card-close-admission --> Final admission: fixed head `2221a099b7e15d7bdf9face8d0cddffb63901f01` / base `05b997b84db26c517604c48d12676f0eb2b86e18`; independent `/root/merge_queue_review` REPLAY PASS (`/tmp/mq-dev-three-cards-independent-review-20261014.json`). GATE [run 3069](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/actions/runs/3069) actor weichen, home-runner/id3, all jobs and steps completed/success: [svc-realcombo](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/actions/runs/3069/jobs/4652), [test](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/actions/runs/3069/jobs/4650), [test-pg](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/actions/runs/3069/jobs/4651). Root will merge with fixed head and force_merge=false; actual result follows read-back. 实际交付:Root经PR合入 `4f84c2e1630cd0311643529fae1c3a99f1dd5d64`,完整树及组件核验匹配固定候选;GATE [run3069](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/actions/runs/3069) actor weichen/home-runner id3,三项必需作业及步骤全部成功。源码外原始收据和独立报告保留,任务卡归档/回收另行完成,状态见Issue518。
weichen added 2 commits 2026-10-14 04:56:31 +00:00
Why: pipefail treated a recent merged-card match as a failed git log after grep exited early, hiding completed cards from precheck and task-close.

Evidence: A disposable long-history regression failed before the fix and passed after it; make test-governance passed 341 cases. Git history confirms PR #489/#488/#486 merge SHAs.

Impact: Detect merged cards reliably and archive only the three authorized trial cards; four unrelated eligible cards remain untouched.

Refs: Dev merge queue #518; Dev #489, #488, #486
Backfill the three archived trial card outcomes
ci / svc-realcombo (pull_request) Successful in 2m12s
ci / test (pull_request) Successful in 5m19s
ci / test-pg (pull_request) Successful in 7m44s
2221a099b7
Why: The archive move staged the path changes while leaving the status and merge receipts as unstaged content; each archived card must carry its actual completed result.

Evidence: The recorded merge commits f00165e8, d852c159, and 05b997b8 are present in origin/main and match Dev PR #489/#488/#486.

Impact: Mark exactly three authorized cards complete and record their merge subjects without changing other task cards.

Refs: Dev merge queue #518; Dev #489, #488, #486
weichen merged commit 4f84c2e163 into main 2026-10-14 05:08: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#538