[adrianwebb]

Outcome

Reconcile main ancestry into staging with an identical staging tree. Replaces #22: a temporary reconciliation head satisfies strict up-to-date checks without modifying main.

Work authority

• Work item / Issue: Reconcile organization branches without losing unmerged work platform#462
• Proposal / decision: User-requested organization-wide branch reconciliation.
• Assignment / checkpoint: Ancestry-only recovery; no runtime assignment.
• Actor: Codex under authenticated account adrianwebb.
• Human authority: adrianwebb
• Agent / capacity provider: Codex desktop; no TreeSeed assignment claimed.
• Exact base ref: 4cafd5b
• Exact head ref: fcd2303
• Human-authored
• Agent-assisted under human authority
• Agent-authored under human authority

Plan

Join current staging and main history, prove the resulting tree equals staging, pass required Actions, merge without squash/rebase, and read back main ancestry.

Changes and commits

One reconciliation merge commit, parents 4cafd5b and 8f9458e. Runtime files remain unchanged. The Verify workflow now runs for all PRs, including ancestry-only PRs; its previous paths-ignore filter skipped the required status check for empty diffs. Main remains untouched.

Verification

Local git merge-tree is conflict-free and produces the identical staging tree; exact refs re-read before push. Required Actions are authoritative and remain enforced. No release or rebuild of release artifacts requested.

Risk and rollback

History-only change. No application state or files to roll back. Preserve both protected branches and do not reset history; a subsequent corrective PR is the recovery path if external heads change.

Completion summary

Reconciliation prepared; merge awaits required Actions. This does not claim organization-wide completion or production release.

Submission checklist

• The change is bounded to the stated work item and target repository.
• Exact base and head refs are recorded and the branch is ready for review.
• Verification and compatibility evidence are recorded above.
• No plaintext secrets, credentials, machine state, or unrelated residue are included.
• Plan, status, commits, and completion summary form a complete durable record.
• Rollback or recovery steps are documented and executable.

Required-check recovery

GitHub rejected the ancestry-only merge because verify was expected despite successful workflow-dispatch verification. Remove only the pull_request paths-ignore filter so the required PR check runs normally. No branch-protection bypass or synthetic check is used. Application source and dependencies are unchanged.