Repository navigation
fix: detect codex startup update chooser - #5174
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Priority: ⬇️ Low Merge Risk: ⚪ Minimal · up to The change makes Codex's startup update chooser detectable as a blocker while keeping detection of the old dialog. No actionable merge risk remains. Pre-merge checks |
|
|
@coderabbitai review |
✅ Action performedReview finished.
|
|
Upstream commits brought in: - fix: detect codex startup update chooser (herdrdev#5174) - fix: confirm closing a workspace's last pane in the tui (herdrdev#5173) - fix: keep sgr pixel mouse units consistent (herdrdev#4971) - fix: reject workspace numbers past the last workspace (herdrdev#5171) - fix: reject oversized canonical input on macos (herdrdev#4988) - fix: save sessions before agents die during macos restart (herdrdev#5092) - fix: preserve hermes plugin list structure (herdrdev#4984) - fix: restore keyboard protocol flags after a terminal reconnect (herdrdev#5088) - fix: reduce interactive pane echo latency (herdrdev#5149) - fix: flush session saves before replacing persisted files (herdrdev#5152) Conflict resolutions: - client shell close-pane confirmation: take upstream's request_pane_close, keep the fork's SetPaneStatus menu action and closes_group confirmation field; a group-root close still confirms client-side and closes the whole group (the fork has no server confirmation_required path, 2d839ce), so upstream's close_pane group test is adapted like close_tab.rs. - pane input: keep the fork's backpressure-preserving send paths and add upstream's keyboard_forwarded tracking; keep send_bytes_after and write_user_input next to upstream's validate_input_submission. - pane mouse: take upstream's merged encoder/position helper. - satisfy the fork's redundant_clone deny lint in the new macos input tests. Sets UPSTREAM_HERDR_COMMIT to 6d697e1 and bumps bora to 0.52.3.
Keep our fork features (federation, gram, api-bridge, guest, push, notifications, agent archive/forget/transfer, accounts, staged updates) alongside upstream's v0.9.4, v0.9.5 and unreleased fixes. Most source conflicts keep our fork's Method enum (upstream's define_operations! macro cannot express our cfg-gated and serde-skipped variants). Detection manifests keep our extra rules; Codex integration scripts switch to upstream's canonical version. Upstream highlights: - Persistent macOS/Linux server (SIGHUP no longer stops it) - Session saves on system shutdown/restart - Plugin update command - Keyboard/IME fixes (non-Latin layouts, Ctrl+Shift, accents) - Windows improvements (PowerShell 7 default, clipboard, notifications) - SSH compression and bandwidth improvements - Performance fixes (CPU, memory, hidden pane improvements) - Codex, Claude Code, Pi, Antigravity, Grok detection updates - New platform modules (launchd spawn, power/shutdown) - Vendor patches (libghostty-vt cursor hyperlink, portable-pty Windows dir) refs herdrdev#5310, herdrdev#5278, herdrdev#5236, herdrdev#5303, herdrdev#5308, herdrdev#5275, herdrdev#5280, herdrdev#5282, herdrdev#5277, herdrdev#5276, herdrdev#5270, herdrdev#5269, herdrdev#5252, herdrdev#5249, herdrdev#5247, herdrdev#5241, herdrdev#5242, herdrdev#5192, herdrdev#5232, herdrdev#5212, herdrdev#5174, herdrdev#5173, herdrdev#5171, herdrdev#5092
Codex’s newer startup update chooser was not recognized as waiting for input. Recognize its update heading together with the continue/skip footer while keeping the old dialog supported. Allow the heading to wrap between words, and update bundled and published manifests together.
Validated against Codex upstream 0.159–0.162 and main, plus a live 0.160.1 chooser: the blocker assertion fails with the old rule and passes after hot reload. Skipping returns to idle. No model requests or updates were run.
Validation: full
just checkpassed before rebase; all 35 detection manifest tests and catalog validation passed after rebasing onto current master and applying the heading-wrap correction. Bundled and catalog manifests are identical.refs #4811