Phase 10 Addendum AD01 / Task AD5: Prepare and Verify clean-pr Locally #205

Planning authority:

• AD01 Contribution Goal and Definition
• AD01 Implementation Guide
• AD01 Roadmap
• AD1 baseline evidence

• Objective: Construct the AD01 delivery as one local normal merge, prove it matches the accepted workbench, and hand a fully verified unpushed commit to existing issue Phase 10 / Task F3: Push Delivery, Refresh PR #136, and Verify Checks #200.
• Acceptance criteria advanced: P10-AD01-A1, P10-AD01-A2, P10-AD01-A3, P10-AD01-B5, P10-AD01-C2, P10-AD01-C4.
• Dependencies: AD4.
• Complexity/risk: High; reversible local mutation of the delivery repository.
• Locked decisions: Same upstream SHA; normal merge; exact accepted workbench blobs for three conflicts and src/ogc-api/model.ts; no force-push; no remote delivery or PR mutation in this task.
• Expected work:
  • record clean delivery branch, remote head, remotes, ancestry, and PR base/head metadata;
  • fetch origin, upstream, and the exact accepted workbench tip into a namespaced local ref;
  • merge exactly a623911201218bc1e814a9f83c64f3a027031990 into local clean-pr;
  • confirm the conflict set matches AD1/AD2;
  • restore the three accepted workbench conflict-resolution blobs and the accepted src/ogc-api/model.ts blob, then inspect automatic src/index.ts;
  • commit the local normal merge without pushing;
  • generate the contribution-bearing delivery manifest and compare every included path with the accepted workbench;
  • audit for zero workbench-only planning, research, governance, issue, workflow-trigger, ignore-rule, temporary, or generated artifacts;
  • repeat full applicable QA, docs, build, packed-artifact, and clean-consumer checks in delivery;
  • record the local commit/tree SHAs, expected ahead count, and exact handoff requirements for Phase 10 / Task F3: Push Delivery, Refresh PR #136, and Verify Checks #200; and
  • commit and push the durable delivery-preparation/handoff evidence to workbench phase-10 without pushing delivery.
• Affected areas: Local OS4CSAPI/ogc-client:clean-pr, limited to the normal upstream merge and reviewed resolution/adaptation content; one workbench handoff-evidence record under docs/research/phase-10/.
• Explicit exclusions: Push, force-push, PR body/comment change, new source work, independent re-authoring of resolutions, workbench-only file delivery.
• Automated acceptance gate:
  • delivery contains the locked upstream SHA and exactly the reviewed merge resolution population;
  • contribution-manifest comparison with accepted workbench reports zero differences;
  • prohibited-path audit reports zero delivery contamination;
  • full delivery QA, documentation, build, package, and consumer gates exit 0;
  • delivery worktree is clean and local clean-pr is ahead of origin/clean-pr only by the reviewed normal merge;
  • no remote delivery ref or PR metadata changed; and
  • the committed and pushed workbench handoff record points explicitly to existing issue Phase 10 / Task F3: Push Delivery, Refresh PR #136, and Verify Checks #200.
• Deliverable: A fully verified local clean-pr merge ready for one normal push by issue Phase 10 / Task F3: Push Delivery, Refresh PR #136, and Verify Checks #200, plus committed and pushed workbench handoff evidence.
• Closing evidence: Local commit/tree SHAs, accepted workbench SHA, manifest/parity results, prohibited-path audit, all delivery gates, remote non-mutation proof, Phase 10 / Task F3: Push Delivery, Refresh PR #136, and Verify Checks #200 handoff, deviations or none.