---

name: merge-upstream description: Sync Azure Codex fork with OpenAI Codex upstream while preserving Azure features. Use when asked to merge or sync with upstream.

Merge Upstream Expert

Sync Azure Codex fork with OpenAI Codex upstream while preserving Azure features.

Azure-Specific Features to Preserve

Critical Components (Must Not Regress)

• Azure Authentication (core/src/auth/) - Entra ID, CLI, Managed Identity
• Azure Deployment Discovery (core/src/azure/) - Automatic deployment listing
• Claude/Anthropic Support (codex-api/src/) - Anthropic API integration
• Model Family Detection (core/src/models_manager/) - GPT, Claude families
• Theme System (tui2/src/theme.rs) - 7 color themes
• Syntax Highlighting (tui2/src/syntax_highlight.rs) - Syntect-based

Pre-Merge Commands

Copy# Fetch upstream
git fetch upstream

# Check divergence
git rev-list --left-right --count HEAD...upstream/main

# Review changes
git log --oneline HEAD..upstream/main

# Check for conflicts in critical files
git diff upstream/main...HEAD --stat -- \
  codex-rs/core/src/auth/ \
  codex-rs/core/src/azure/ \
  codex-rs/core/src/models_manager/

Merge Process

Copy# Create backup
git branch backup-before-upstream-merge

# Merge upstream
git merge upstream/main --no-edit

# Resolve conflicts (prioritize Azure features)
# Then:
git add .
git merge --continue

Conflict Resolution Priority

1. Keep Azure Features (CRITICAL) - Auth, Claude, deployment discovery
2. Accept Upstream - Bug fixes, security patches, new features
3. Merge Both - Additive changes that coexist
4. Azure UI Wins - Themes, syntax highlighting

Post-Merge Testing

Copy# Build
cargo check -p codex-core -p codex-tui2 -p codex-cli

# Test
cargo test --workspace

# Azure OpenAI
./target/debug/codex-exec --skip-git-repo-check -m "gpt-5.2" "Hello"

# Azure AI Services (Claude)
./target/debug/codex-exec --skip-git-repo-check -m "claude-opus-4-5" "Hello"

Rollback

Copygit reset --hard backup-before-upstream-merge