chore(sync): record upstream ancestry after #224

[aaditagrawal]

Summary

Follow-up to #224. Squash-merge dropped the ours second parent, so main looked 3 commits behind upstream/main again even though the ports are present.

This PR is a pure git merge -s ours upstream/main with no tree changes. It must be merged with a merge commit (not squash/rebase) so the ancestry link sticks.

Verification

• git rev-list --left-right --count HEAD...upstream/main → 1362 0 on this branch
• Empty diff vs main expected

  

[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 Plus

Run ID: 59a48a6d-c7a8-4744-a3e4-e1c08038f922

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

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

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	11.4 KiB	11.4 KiB	−25 B (−0.2%)	15.1 KiB	✅
Codex	Thread snapshot wire	5.5 KiB	5.5 KiB	−12 B (−0.2%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	5.9 KiB	5.9 KiB	−13 B (−0.2%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	49.8 KiB	49.8 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	17	17	0 (0.0%)	21	✅
Claude	Total thread wire	11.4 KiB	11.4 KiB	−4 B (−0.0%)	15.1 KiB	✅
Claude	Thread snapshot wire	5.5 KiB	5.5 KiB	−1 B (−0.0%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	5.9 KiB	5.9 KiB	−3 B (−0.0%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	50.6 KiB	50.6 KiB	0 B (0.0%)	66.4 KiB	✅
Claude	Live turn messages	17	17	0 (0.0%)	21	✅

Baseline: f191d6e · PR result: aa175c4 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 94.7 KiB
• Claude decoded thread snapshot: 95.4 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.