reapply fork changes onto rust-v0.118.0

Author: Loongphy

AGENTS.md

@@ -1,5 +1,13 @@
 # Rust/codex-rs
 
+## Temporary upstream reapply constraints
+
+- Current branch `feat/rust-v0.118.0` is performing an upstream reapply onto `rust-v0.118.0`.
+- For this reapply, only implementation code and necessary documentation may be changed.
+- Do not write or modify any test code, snapshot files, or `*.snap` / `*.snap.new` artifacts.
+- Do not run lint / format / auto-fix commands during this task, including `cargo fmt`, `just fmt`, `cargo clippy`, `cargo clippy --fix`, `just fix`, or `cargo insta ...`.
+- This task is considered complete only when the `codex-upstream-reapply` skill acceptance criteria are satisfied, including `cargo build -p codex-cli` and the final `cargo build -p codex-cli --release` build in `codex-rs`.
+
 In the codex-rs folder where the rust code lives:
 
 - Crate names are prefixed with `codex-`. For example, the `core` folder's crate is named `codex-core`

CHANGED.md

@@ -10,13 +10,13 @@ This file captures the full set of changes currently in the working tree.
 - On WSL2, composer draft copy reuses the existing Windows clipboard fallback so copies still land in the Windows system clipboard.
 - `Ctrl+Shift+C` now takes its own composer-copy path instead of falling through to the existing `Ctrl+C` clear/interrupt/quit behavior when draft text is present.
 - Added footer shortcut help text for the new draft-copy binding.
-- This user-visible shortcut behavior must stay aligned across both the classic `tui` and `tui_app_server` implementations.
+- `rust-v0.118.0` removed the old `tui_app_server` crate upstream, so this behavior now lives in the app-server-backed `codex-rs/tui` surface only.
 
 ## TUI status header and polling
 
-- Added a status header above the composer in both the classic `tui` and `tui_app_server` implementations. It surfaces model + reasoning effort, current directory, git branch/ahead/behind/changes, and rate-limit remaining/reset time.
-- Git status is collected in the background (5s interval, 2s timeout) and rendered when available in both TUI implementations.
-- The status header must stay fresh in both TUI implementations. In the classic `tui`, rate-limit polling is now more frequent (15s); `tui_app_server` must surface equivalent up-to-date rate-limit data through its app-server event path.
+- Added a status header above the composer in the app-server-backed `codex-rs/tui` surface. It shows model + reasoning effort, current directory, git branch/ahead/behind/changes, and rate-limit remaining/reset time.
+- Git status is collected in the background (15s interval, 2s timeout) and rendered when available.
+- `rust-v0.118.0` removed the old `tui_app_server` crate upstream, so the reapply keeps only the surviving TUI path aligned with the status-header skill.
 
 ## TUI auth.json watcher
 

README.md

@@ -2,7 +2,7 @@
 
 An opinionated Codex CLI. This is strictly a personal hobby project, forked from openai/codex.
 
-![Codex build](https://img.shields.io/static/v1?label=codex%20build&message=rust-v0.117.0-f82d18d&color=2ea043)
+![Codex build](https://img.shields.io/static/v1?label=codex%20build&message=rust-v0.118.0-b630ce9a4e&color=2ea043)
 
 ![TUI](
 https://github.com/user-attachments/assets/127abbc2-cb30-4d6e-8a81-ce707260c045)