Repository navigation

fix(server): preserve native history in busy Codex forks - #29239

Open

Alb11747 wants to merge 8 commits into

pingdotgg:mainfrom

Alb11747:fix/codex-busy-fork

Open

fix(server): preserve native history in busy Codex forks#29239
Alb11747 wants to merge 8 commits into
pingdotgg:mainfrom
Alb11747:fix/codex-busy-fork

Commits on Nov 3, 2026
- fix(server): preserve native history in busy Codex forks
  
  Alb11747
  and
  codex
  committed
  040183c
- fix(server): require a native boundary for busy forks
  
  Alb11747
  and
  codex
  committed
  fff42d1
- fix(server): recover forks invalidated by parent rollback
  
  Alb11747
  and
  codex
  committed
  409eafb
- fix(server): refresh fork history after native clone failure
  
  Alb11747
  and
  codex
  committed
  bbd5562
Commits on Nov 10, 2026
- Merge upstream main into fix/codex-busy-fork
  
  Alb11747
  and
  codex
  committed
  d47bcab
Commits on Nov 11, 2026
- Merge upstream native fork recovery into fix/codex-busy-fork
  
  Alb11747
  and
  codex
  committed
  a8ba41b
Commits on Nov 12, 2026
- Merge remote-tracking branch 'origin/main' into fix/codex-busy-fork
  juliusmarminge
  committed
  b5ea4a2
- test(server): trim busy fork tests to the cases that guard the change
  juliusmarminge
  committed
  6a4f036