Reconcile main history into staging

[adrianwebb]

Outcome

Ensure staging contains all main history without changing current staging content.

Work authority

• Work item / Issue: Organization-wide staging reconciliation requested by Adrian Webb
• Proposal / decision: Direct operator request
• Assignment / checkpoint: Repository integration audit
• Actor: Codex
• Human authority: Adrian Webb
• Agent / capacity provider: Local Codex workspace
• Exact base ref: staging d2e440e
• Exact head ref: codex/reconcile-main-history 932d53c

Contributor mode:

• Human-authored
• Agent-assisted under human authority
• Agent-authored under human authority

Plan

Merge main ancestry into current staging and preserve the exact staging tree.

Changes and commits

The merge joins production history into staging without restoring superseded content.

Verification

• I ran the narrowest relevant package verification and documented any checks that could not be run.
• Exact tree comparison against staging is empty; the merge adds ancestry only.

Risk and rollback

This is ancestry-only reconciliation. The prior staging commit remains the first parent and provides an exact rollback point.

Completion summary

Staging is no longer behind main and its file tree is unchanged.

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.