sync: record upstream/main ancestry for 2026-07-20 - #179

Merged

cursor[bot] merged 32 commits into

mainfrom

codex/sync-20260720-ancestry-daf2

Jul 20, 2026

aaditagrawal commented Jul 20, 2026

Owner

Summary

Records upstream/main ancestry through 2640e6dc (pingdotgg#4137) after the Jul 20 port stack landed on the fork.

This is an ancestry-only merge. Conflict resolutions keep the fork adaptations already shipped in #171–#174 / #177 / #178 / #173:

Protected AGENTS.md fork policies and gates
Desktop WSL resolvedEnv + engine version-range check
Warm-cache / deferred thread seed gating
dev-runner bootstrap FD + portable hook behavior
Fork lockfile / Cursor SDK branding paths

Test plan

git merge-base HEAD upstream/main equals upstream/main
Check / Test green (expect no functional diff vs main)
Merge to main, then cut v0.36.0

yordis and others added 30 commits

July 18, 2026 12:45


          feat: draft hero landing on the index route (pingdotgg#4055)

1bd2fa2

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>


          feat: file explorer mention actions and zoom-aware context menus (pin…

4cfec8c

…gdotgg#4054)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>


          fix(web): avoid duplicate mention text on paste

2318e00

Co-authored-by: codex <codex@users.noreply.github.com>


          fix(mobile): restore iOS home screen branding (pingdotgg#4025)

03e20c8

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          perf(client): defer active thread cache writes (pingdotgg#4006)

765e1b5


          Default diffs to working changes (pingdotgg#3974)

38e0bb0

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          Add Grok to marketing site provider list (pingdotgg#3484)

e350c0a


          Fix reopening existing Diff tab (pingdotgg#3973)

31caa56

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          Fix sending messages during active turns (pingdotgg#3919)

d8b12ae

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          [codex] Route OpenCode missing-session errors through Effect (pingdot…

d0b9f8d

…gg#3608)

Co-authored-by: Codex <codex@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>


          [fix/feat:ui] Show default option badge (pingdotgg#3232)

c0e161a

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          [fix/feat:ui] Preserve open-in editor brand colors (pingdotgg#3225)

e63403f

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          fix(web): handle macOS Home and End in composer (pingdotgg#2508)

b859a57

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          Allow failed remote environments to be removed (pingdotgg#4084)

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          [codex] canonicalize client timestamps (pingdotgg#4112)

da3c203


          [fix/feat:ui] Make selected menu checks blue (pingdotgg#3234)

5c66110

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          fix(desktop): Validate WSL node version against engine range after pr…

bf76535

…obe success (pingdotgg#3621)

Co-authored-by: Julius Marminge <julius0216@outlook.com>


          Refresh splash screen and favicon branding (pingdotgg#4120)

ebe8afb


          Add terminal selection copy action (pingdotgg#2904)

1735e27


          Add isolated app testing workflow (pingdotgg#4121)

4f11740

Co-authored-by: codex <codex@users.noreply.github.com>


          feat(web): themed sidebar header art for nightly and dev builds (ping…

53e3c98

…dotgg#4130)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>


          feat: add headless t3 connect setup for SSH hosts (pingdotgg#3749)

7a820ab

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          Refine T3 Connect authorization surfaces (pingdotgg#4159)

2b180a2

Co-authored-by: codex <codex@users.noreply.github.com>


          fix: increase OpenCode server startup timeout from 5s to 30s (pingdot…

398140a

…gg#4132)


          fix(shared): delete unused agentAwareness phase predicates (pingdotgg…

e8ff6bc

…#4134)


          fix(mobile): Stabilize native stack option updates (pingdotgg#4037)

271454c

Co-authored-by: codex <codex@users.noreply.github.com>


          Make test-t3-app skill discoverable by Claude Code (pingdotgg#4162)

69c8be2

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>


          fix(web): improve dev sidebar backdrop contrast & remove version pills (

b511227

pingdotgg#4166)


          Fix draft banner stack overlap (pingdotgg#4164)

7e1a0d5

Co-authored-by: codex <codex@users.noreply.github.com>


          Add portable mobile app testing guidance (pingdotgg#4165)

e34250d

Co-authored-by: codex <codex@users.noreply.github.com>

eeinarsson and others added 2 commits

July 20, 2026 01:33


          fix(client): use lightweight connection probe (pingdotgg#4137)

2640e6d


          sync: record upstream/main ancestry for 2026-07-20

037fd02

Merge upstream after the Jul 20 port stack (#171–#174, #177, #178, #173).
Conflicts keep fork Cursor SDK, branding, protected AGENTS.md policies,
WSL resolvedEnv + version-range check, warm-cache thread seed gating,
and fork T3CODE_BOOTSTRAP_FD / portable hook adaptations.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

github-actions Bot added vouch:trusted size:XS labels

cursor Bot merged commit 937f301 into main

12 checks passed

cursor Bot deleted the codex/sync-20260720-ancestry-daf2 branch

July 20, 2026 01:43

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS vouch:trusted