Repository navigation

Wire production foreign-conflict resolver for rebases - #140

Merged

mchwang merged 21 commits into

mainfrom

codex/issue22-rebase-fix-adapter

Oct 7, 2026

Merged

Wire production foreign-conflict resolver for rebases#140
mchwang merged 21 commits into
mainfrom
codex/issue22-rebase-fix-adapter

Commits on Oct 7, 2026
- Wire production rebase conflict resolver
  mchwang
  committed
  aadb1d1
- Harden conflict resolver resource settlement
  mchwang
  committed
  d68f0f2
- Enforce tracked spawn deadlines
  mchwang
  committed
  c544ac6
- Retain untracked process ownership
  mchwang
  committed
  5084fb3
- Document retained process outcomes
  mchwang
  committed
  ff084f4
- Cover escaped pipe ownership wait
  mchwang
  committed
  05aabc7
- Close conflict lifecycle gaps
  mchwang
  committed
  2fcf3e5
- Use monotonic conflict deadline
  mchwang
  committed
  f97de8e
- Cover forward conflict clock steps
  mchwang
  committed
  42f2543
- Seed conflict storage before importing snapshot
  mchwang
  committed
  aaef036
- Recheck conflict import deadline before Docker
  mchwang
  committed
  238afc9
- Fail closed on escaped rebase processes
  mchwang
  committed
  0aae7b5
- Preflight unsettled rebase recovery
  mchwang
  committed
  d541259
- Retain profile staging cleanup ownership
  mchwang
  committed
  ccacc56
- Merge remote-tracking branch 'origin/main' into codex/issue22-rebase-fix-adapter
  mchwang
  committed
  19e03d8
- Keep recovered rebase processes fail closed
  mchwang
  committed
  cccabbd
- Recover pre-spawn rebase ownership
  mchwang
  committed
  a68d371
- Keep recovery paths and conflict deadlines trusted
  mchwang
  committed
  053dd7d
- Preserve configured adapter timeout cap
  mchwang
  committed
  f25f7da
- Carry invocation budget through container launch
  mchwang
  committed
  162ffcb
- Clarify pre-merge orchestration boundary
  mchwang
  committed
  fb8aa50

Commits

Commits on Oct 7, 2026