chore(merge): enforce policy removals (images + cargo caches)

2026-10-25 03:32:32 +00:00 · 2025-09-15 16:11:19 +00:00
parent c679282d50
commit 0b65153aa0
2 changed files with 0 additions and 51 deletions
@@ -1,17 +0,0 @@
-# Upstream Merge Plan
-
-Mode: by-bucket
-
-Strategy
- Use merge branch 'upstream-merge' already checked out.
- Merge upstream/main with --no-commit, resolve by policy buckets.
- Prefer ours for codex-rs/tui/**, codex-cli/**, and core wiring files.
- Prefer theirs for codex-rs/common/**, codex-rs/exec/**, codex-rs/file-search/**.
- Default to upstream elsewhere if compatible.
- Purge image assets matching .github/codex-cli-*.(png|jpg|jpeg|webp).
- Preserve invariants: browser_* and agent_* tools; web_fetch; gating; screenshot queuing; UA/version helpers; public re-exports; models alias.
- Validate with scripts/upstream-merge/verify.sh and ./build-fast.sh.
-
-Notes
- Avoid re-introducing removed paths; record notable decisions in MERGE_REPORT.md.
- Do not rebase; push merge branch when passing.
@@ -1,34 +0,0 @@
-# Upstream Merge Report
-
-Date: 2025-09-15
-Branch: upstream-merge
-Source: upstream/main -> ours
-Mode: by-bucket
-
-## Incorporated
- Adopted upstream changes in `codex-rs/core/src/config.rs` (minor cleanup) and `codex-rs/core/prompt.md` (docs additions).
- Defaulted to upstream for non-protected areas with no conflicts.
-
-## Dropped/Kept Ours
- Kept our TUI files per policy:
-  - `codex-rs/tui/src/new_model_popup.rs`
-  - `codex-rs/tui/src/onboarding/onboarding_screen.rs`
-  - `codex-rs/tui/src/onboarding/welcome.rs`
-  Rationale: preserve strict ordering, browser/agent tool UX, and fork-specific TUI enhancements.
-
-## Purged
- No `.github/codex-cli-*` image assets present; nothing to purge.
-
-## Invariants Verified
- Tool families present and exposed (`browser_*`, `agent_*`, `web_fetch`).
- Exposure gating for browser tools preserved.
- Screenshot queue semantics unchanged.
- Version/UA helpers intact (`codex_version::version()`, `get_codex_user_agent_default()`).
- Public re-exports in `codex-core` and `models` alias intact.
-
-## Validation
- scripts/upstream-merge/verify.sh: PASSED (build-fast ok, API checks ok).
-
-## Notes
- No prefer-theirs conflicts in `codex-rs/common/**`, `codex-rs/exec/**`, or `codex-rs/file-search/**` in this merge window.
- Upstream fetch produced many new branches/tags; merge scope limited to `main`.