[codex] Sync upstream ancestry without changing fork tree

[aaditagrawal]

Summary

This PR performs an ancestry-sync merge of upstream/main into the fork without changing the working tree.

The goal is to clear the fork's "behind upstream" count after earlier upstream fixes were already ported into the fork through cherry-picks, manual conflict resolution, and fork-native follow-up work. GitHub compares commit ancestry rather than patch equivalence, so the fork still showed 8 behind even though the code for those upstream changes was already present.

What This Does

This branch merges upstream/main using the ours strategy. That records upstream as a parent in history while intentionally keeping the fork's current tree exactly as-is.

In practice, that means:

• no source files change
• the fork keeps its existing feature set and fork-specific adaptations
• GitHub can stop treating those upstream commits as missing from ancestry

Why This Is Safe Here

This is appropriate here because the previously missing upstream commits were already present in substance in the fork:

• some had already been cherry-picked or ported earlier
• the remaining conflicted upstream changes were just merged into the fork in fork-native form

This PR is therefore a history reconciliation step, not a content update.

Validation

I ran the required repo checks successfully:

• bun fmt
• bun lint
• bun typecheck

[coderabbitai]

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 980352b6-3987-47d0-b13d-8e8265e002e4

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch codex/upstream-ancestry-sync

📝 Coding Plan

• Generate coding plan for human review comments

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}