Make task recovery and synchronization ready for merge queue adoption #519

Merged
weichen merged 36 commits from feature/merge-queue-policy-draft into main 2026-10-13 15:57:05 +00:00
36 Commits
Author SHA1 Message Date
weichen 536f0e4b55 Record the sync checkpoint
ci / svc-realcombo (pull_request) Successful in 2m21s
ci / test (pull_request) Successful in 5m55s
ci / test-pg (pull_request) Successful in 9m4s
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=5efbeebbdc09f8c2484613230a29c882c54652f0; before_record=6aa97d18153130c46dcbdc75a35735175cd4d1eb.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 15:44:07 +00:00
weichen 6aa97d1815 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=5efbeebbdc09f8c2484613230a29c882c54652f0.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 15:43:41 +00:00
weichen 8ffe4a5ac2 Record acceptance and preserve the fixed candidate evidence
ci / svc-realcombo (pull_request) Successful in 2m46s
ci / test (pull_request) Successful in 6m20s
ci / test-pg (pull_request) Successful in 14m15s
Why: Preserve the user-approved stage-7 conclusion before the final merge candidate is frozen.

Evidence: Import original precheck, sync, build, CI and independent replay receipts; validate current fixed components, document links and the incoming acceptance script syntax through make evidence.

Impact: Update this task card only; preserve implementation and activation boundaries. New HEAD CI remains required before merge.

Refs: Dev PR #519; Guidelines PR #5; Documents PR #96; queue Issue #518
2026-10-13 15:22:32 +00:00
weichen 76b62669d2 Record the sync checkpoint
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=5aae47ebca20ad1f3add3b080212cca7e1c6edf9; before_record=8d2639d3c4c426d75335353e12bed42a3eebadb4.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 15:19:20 +00:00
weichen 8d2639d3c4 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=5aae47ebca20ad1f3add3b080212cca7e1c6edf9.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 15:18:55 +00:00
weichen 17ea5fd0a7 Record the sync checkpoint
ci / test (pull_request) Successful in 5m35s
ci / svc-realcombo (pull_request) Successful in 2m57s
ci / test-pg (pull_request) Successful in 9m31s
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=ee9b437b22b49f96e1bc65f79417b22e8e82a37c; before_record=5442ef67c8a5d3b3972255fa9579f488f2ae28a1.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 14:44:27 +00:00
weichen 5442ef67c8 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=ee9b437b22b49f96e1bc65f79417b22e8e82a37c.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 14:44:04 +00:00
weichen 3695237454 Adopt the merged merge queue standards and implementation plan in the Dev candidate
Why: The approved document dependencies have been reviewed and merged. Their actual immutable merge commits must be fixed before final host validation, while operational activation remains a separate gate.

Evidence: Independent document replay and verified PR merges are recorded in the task card. The staged host combination passed make test with actual merged child pointers; final commit build/CI remains pending and will be recorded outside source.

Impact: Advance only the two reviewed merged child pins, expose the real plan path, and record partial stage-seven approval and pending activation. Preserve current main components and existing admission/owner boundaries.

Refs: Guidelines PR #5 (2f5b198); Documents PR #96 (129cc35); Dev PR #519; implementation plan U4-U6; Issue #518
2026-10-13 14:44:01 +00:00
weichen 52f516edb8 Record the sync checkpoint
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=20e086e48b9cec7f300feba5342db7a0661a4d4e; before_record=3108e7149695975c04b92b0b1e1a7b8d1ab7c269.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 14:18:17 +00:00
weichen 3108e71496 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=20e086e48b9cec7f300feba5342db7a0661a4d4e.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 14:17:48 +00:00
weichen d882563dbf Rebuild the validation record after the authoritative combination advances
ci / svc-realcombo (pull_request) Successful in 1m46s
ci / test (pull_request) Successful in 5m6s
ci / test-pg (pull_request) Successful in 7m51s
Why: Main advanced after the first fixed candidate passed CI, changing four component pins and invalidating final admission against the new target. Stage progress must also be referenced outside fixed source to avoid status-driven commits.

Evidence: Source-external original receipts preserve the previous clean local test/build, three successful CI jobs on 80f5e9a, detection of target advance, the refused transient lock and successful serial synchronization to 10d54d5. New combination verification and exact-head CI are pending.

Impact: Preserve the merged authoritative component versions; record the expired candidate honestly and replace a temporary stage-status sentence with its authoritative record pointers. No platform protection change or queue activation.

Refs: PR #519; main PR #513; implementation plan U1/U3/U4; Issue #518
2026-10-13 09:34:35 +00:00
weichen b37d0575ed Record the sync checkpoint
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=10d54d5ffb3d3fa4a4ea256537b2439cef4cc7f3; before_record=63efa8369e45cb30d609873b1d270344cb4a4236.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 09:31:03 +00:00
weichen 63efa8369e Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=10d54d5ffb3d3fa4a4ea256537b2439cef4cc7f3.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 09:30:34 +00:00
weichen 80f5e9ade3 Record implementation approval and prepare formal combination validation
ci / svc-realcombo (pull_request) Successful in 1m45s
ci / test (pull_request) Successful in 5m12s
ci / test-pg (pull_request) Successful in 7m44s
Why: The owner confirmed the delivered implementation and authorized the stated combination-validation and PR-preparation exit.

Evidence: Strict recovery precheck was READY and task-resume imported its original SELF receipt without changing source HEAD. The task card records the owner's confirmation separately from command evidence.

Impact: Task state only; stage-seven acceptance, Guidelines integration order, platform owner actions and real-trial gates remain distinct.

Refs: .task/feature-merge-queue-policy-draft.md; policy/delivery.md stages 6-7; approved implementation plan U4
2026-10-13 09:02:30 +00:00
weichen 1e9bb9ec5e Record verified merge queue implementation and review outcomes
Why: Preserve the exact implementation object, independent review findings, remediation evidence and remaining stage gates for the owner review.

Evidence: External task-sync and test-governance receipts measured clean candidate cca59c88dd before and after execution. Governance ran 340 tests: 322 passed and 18 environment-dependent skips. Local receipts remain SELF.

Impact: Task record and removal of one trailing policy blank line only; tested code and check definitions unchanged. No queue activation, platform protection change or real CI/trial claim.

Refs: .task/feature-merge-queue-policy-draft.md; Documents plan ba4044d U1-U6; independent review R1/R2; Issue #518
2026-10-13 08:51:57 +00:00
weichen cca59c88dd Reject rewritten target history during local task recovery
Why: A LOCAL_READY receipt must permit normal target advancement without accepting a rewind or divergent target history after its observation.

Evidence: Two disposable real Git regressions reproduced erroneous successful recovery before the guard; all 18 task recovery tests pass afterward. Raw SELF receipts are in the task card.

Impact: Reject abnormal target ancestry before receipt import; preserve normal local recovery and strict delivery defaults. Correct stale implementation-stage documentation without activating the queue.

Refs: Documents implementation plan ba4044d U2; independent review R1 and R2; .task/feature-merge-queue-policy-draft.md
2026-10-13 08:44:02 +00:00
weichen 7f197e9e71 Preserve implementation objects and original governance evidence
Why: make the approved increment and its remaining activation gates reviewable without treating local tests as platform admission.

Evidence: original SELF red-green, direct suites, governance suite and read-only platform outputs were captured by make evidence in the task card.

Impact: task record and source references only; no platform operation, CI trigger change or activation.

Refs: .task/feature-merge-queue-policy-draft.md; policy/platform-admission.md; Gitea Issue #518
2026-10-13 08:29:06 +00:00
weichen 7a8069db14 Record the sync checkpoint
Why: bind the task validation checkpoint to the integration baseline.

Evidence: SELF recursive component checks; sync_base=ff3fb4a7ebe432ab21c6b9668abc9823aca2fdd1; before_record=cbe69691f944ee220568a7f309f1866fa17bb10f.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 08:26:31 +00:00
weichen cbe69691f9 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=ff3fb4a7ebe432ab21c6b9668abc9823aca2fdd1.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 08:26:08 +00:00
weichen b8218c6b87 Preserve implementation objects and original governance evidence
Why: make the approved increment and its remaining activation gates reviewable without treating local tests as platform admission.

Evidence: original SELF red-green, direct suites, governance suite and read-only platform outputs were captured by make evidence in the task card.

Impact: task record and source references only; no platform operation, CI trigger change or activation.

Refs: .task/feature-merge-queue-policy-draft.md; policy/platform-admission.md; Gitea Issue #518
2026-10-13 08:25:46 +00:00
weichen d3d60f4a40 Verify serial delivery and isolated failures in disposable Git repositories
Why: waiting branches should keep their work while one candidate syncs and merges, and a conflict must not block unrelated healthy work.

Evidence: SELF three Git scenarios and governance suite captured by make evidence; real CI and three-business-task acceptance remain NOT_RUN.

Impact: local regression scenarios only; no automatic queue mutex, production merge or measured CI savings are claimed.

Refs: U6; tests/test_merge_queue_trial.py; .task/feature-merge-queue-policy-draft.md
2026-10-13 08:22:13 +00:00
weichen 501c727620 Prepare exact required CI settings for the platform owner
Why: the observed main protection does not require status checks, so platform admission must be verified before activating the delivery queue.

Evidence: SELF read-only configuration and actual PR context names recorded in the task card; protection changes and negative-case replay remain NOT_RUN.

Impact: owner instructions and six-field configuration proposal only; no remote protection, approval count or workflow is changed.

Refs: U5; policy/platform-admission.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 08:21:58 +00:00
weichen 4629b871db Connect delivery windows and recovery to the repository rules
Why: agents need consistent entrypoints and recording defaults to avoid retrying synchronization and CI outside the final delivery window.

Evidence: SELF generated-task-card red-green regression and governance suite recorded through make evidence; pending shared record created as Issue #518.

Impact: rules, task template and capability matrix stay explicit about pending activation, default strict startup, manual coordination and unchanged CI triggers.

Refs: U4; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 08:21:46 +00:00
weichen 1024c389f6 Keep fixed-candidate evidence outside the measured checkout
Why: recording checks in a frozen task card can change the candidate and invalidate current-head CI.

Evidence: SELF fixed-candidate capture regression and all 33 evidence tests passed; actual output and object digests are preserved by make evidence.

Impact: document preparation, external receipts and post-phase import using existing schema 1; no filesystem freeze or trust upgrade is introduced.

Refs: U3; policy/governance.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 07:53:47 +00:00
weichen eb46bbb296 Separate local task recovery from delivery readiness
Why: an existing authorized task should not merge a moving target merely to resume local work, while new task startup and delivery remain strict.

Evidence: SELF red-green recovery and environment regressions; task, recovery, evidence and local-mode write-guard suites passed through make evidence.

Impact: add explicit LOCAL_READY and task-resume, validate worktree/card/baseline and receipt purpose, preserve schema 1 and prevent local receipts from starting or releasing tasks.

Refs: U2; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 07:42:12 +00:00
weichen 03cbeac8e6 Avoid new commits when the task already contains the integration baseline
Why: repeated task-sync calls changed HEAD and invalidated CI even when main had not advanced.

Evidence: SELF red-green regression and 58 task lifecycle tests recorded through make evidence in the task card.

Impact: sync still fetches and validates components, creates records only for an actual merge, and reports the complete final source SHA.

Refs: U1; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 07:05:06 +00:00
weichen af223189f3 Preserve the planning validation and synchronization evidence
Why: retain original planning-stage receipts and fixed source references before requesting implementation-plan review.

Evidence: SELF precheck, document checks and synchronization outputs were captured by make evidence in the task card; implementation and platform trials remain NOT_RUN.

Impact: task record only; no delivery-mode or runtime change.

Refs: .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
2026-10-13 06:46:35 +00:00
weichen eb0a0d1d4f Record the sync checkpoint
Why: bind the task validation checkpoint to the latest integration baseline.

Evidence: SELF recursive component checks; sync_base=aa6364fddc597beeacf1381a207d131841b8c54e; candidate=d94b3f399f5743852c37993ec316219a52305dd7.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 06:43:32 +00:00
weichen d94b3f399f Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=aa6364fddc597beeacf1381a207d131841b8c54e.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 06:43:09 +00:00
weichen bfebb7969a Preserve the planning validation and synchronization evidence
Why: retain original planning-stage receipts and fixed source references before requesting implementation-plan review.

Evidence: SELF precheck, document checks and synchronization outputs were captured by make evidence in the task card; implementation and platform trials remain NOT_RUN.

Impact: task record only; no delivery-mode or runtime change.

Refs: .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
2026-10-13 06:42:57 +00:00
weichen 64dd48e92b Record the scheduling baseline and implementation plan for review
Why: preserve the user's continuation from the delivered r1 specification into a concrete implementation and verification plan.

Evidence: precheck and plan source/link/example checks are preserved as SELF receipts in the task card; code, CI and platform trials remain NOT_RUN.

Impact: approval metadata, plan association and project entry only; the delivery mode remains unchanged and the plan awaits stage 5 review.

Refs: policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
2026-10-13 06:40:57 +00:00
weichen 913b214f28 Preserve the synchronized draft validation receipts
Why: retain the actual synchronization and document checks for review of the proposed scheduling policy.

Evidence: make evidence captured precheck, task-sync, file digests and relative-link checks as SELF in the task card; CI and execution trials remain NOT_RUN.

Impact: task evidence only; the candidate policy remains proposed and the runtime delivery mode is unchanged.

Refs: .task/feature-merge-queue-policy-draft.md; policy/merge-queue.md
2026-10-13 06:09:13 +00:00
weichen e8b1a9eaca Record the sync checkpoint
Why: bind the task validation checkpoint to the latest integration baseline.

Evidence: SELF recursive component checks; sync_base=3e5416a8226c2dfdd108d6282566639c2ed41f1e; candidate=b391fe9149f9fb2dbd3a8f3ecb9a6c9b5145e2e9.

Impact: task metadata only.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 06:05:56 +00:00
weichen b391fe9149 Merge authoritative main into the task branch
Why: include the current integration baseline before verification.

Evidence: fetched origin/main=3e5416a8226c2dfdd108d6282566639c2ed41f1e.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
2026-10-13 06:05:29 +00:00
weichen be1f2b98f8 Draft the final verification and merge scheduling policy
Why: prepare a reviewable delivery window and migration contract that reduces repeated synchronization while preserving final CI and approval requirements.

Evidence: SELF precheck, document checks and read-only platform observations are preserved in .task/feature-merge-queue-policy-draft.md; runtime queue and platform trials remain NOT_RUN.

Impact: proposed policy, project entry and task record only; scripts, workflow, platform protection and guideline gitlink are not changed by this draft.

Refs: policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
2026-10-13 06:05:13 +00:00
weichen 4e7bf52a7a Record the task card for feature-merge-queue-policy-draft
Why: establish the authorized task workspace and its initial baseline.

Evidence: preserved precheck receipt in .task/feature-merge-queue-policy-draft.md; R0=05085d9a08f2e34d65712434894144d010203d8a.

Impact: task metadata only; the feature workspace starts at 05085d9a08.

Refs: .task/feature-merge-queue-policy-draft.md
2026-10-13 05:42:12 +00:00