Fix persistent code rewind restore

Wire FileHistoryRestore through core, create per-thread file-history checkpoints for user turns, and keep the pre-response Esc rewind path from leaving interrupted history behind.

Also bumps Open Codex to 0.133.3 and documents the rewind behavior for the release prompt.

Author: LEON-gittech

FEATURES.md

@@ -53,7 +53,8 @@ Fast-moving prompt packs, hooks, setup flows, and project policies are better ha
 | `/export` | Export the current session transcript to a user-chosen `.md` or `.txt` path. | `/export <path>` | Useful for debugging, archival, and sharing. |
 | Renamed session identity | Renamed sessions show `Session: <name>` in the chat composer and use the name in quit guidance while keeping resume commands direct. | `/rename`, chat composer, quit summary | Resume hints use `open-codex resume <thread-id>` / `open-codex-dev resume <thread-id>` instead of picker wording. |
 | Agent view session browser (beta) | Users can browse saved sessions, peek transcript content, resume a selected thread, or start a new session from the browser. | `codex agents`, composer Left arrow | Beta surface; useful for local session navigation but still expected to evolve. |
-| Claude Code-style rewind UX | Double-Esc rewind supports code + conversation restore and a cleaner picker. | Double-Esc backtrack flow | Recent fixes tightened session scoping and ordering. |
+| Claude Code-style rewind UX | Double-Esc rewind supports code + conversation restore and a cleaner picker. | Double-Esc backtrack flow | Recent fixes tightened session scoping, ordering, and pre-response Esc rewind. |
+| Persistent code rewind checkpoints | Code restore uses per-thread file-history checkpoints that survive TUI exit/resume. | User turn start, apply_patch tracking, `FileHistoryRestore` | Restores tracked patch edits for the current thread only, not unrelated sessions or untracked global git state. |
 | Revoke restore scope fix | Conversation-only restore no longer rolls back files. | Revoke/rewind restore logic | Fixed by `b6f62e4867`. |
 | Esc interrupt routing | Single Esc interrupt and double-Esc rewind detection both work without blocking each other. | Composer key handling | Fixed by `0d20c120d8`. |
 
@@ -94,6 +95,13 @@ Fast-moving prompt packs, hooks, setup flows, and project policies are better ha
 
 ## Release Notes
 
+### 0.133.3 - 2026-05-27
+
+- Wire code rewind all the way through core: `FileHistoryRestore` now restores tracked file checkpoints instead of being a no-op.
+- Persist file-history checkpoints under the current thread id, so code restore still works after quitting and resuming the same session.
+- Start file-history checkpoints when a real user turn begins, matching Claude Code's snapshot-before-edits model while keeping restore scoped to the current Open Codex thread.
+- Extend the pre-response Esc rewind path so the submitted prompt returns to the composer, the interrupted turn is rolled back from conversation history, and the transient interrupt notice is not left behind.
+
 ### 0.133.2 - 2026-05-25
 
 - Extend Claude-style Esc rollback through the `TurnStarted`-before-first-output window: if the model has not emitted assistant text, reasoning, plan output, or tool/command activity yet, Esc restores the submitted prompt to the composer and interrupts the turn.

README.md

@@ -127,7 +127,19 @@ From recent fork-specific changes:
 
 This brings a Claude Code-style export flow into the TUI without requiring external scripts or manual transcript scraping.
 
-### 6. Reasoning effort controls and per-turn status visibility
+### 6. Claude Code-style rewind and persistent code restore
+
+From recent fork-specific changes:
+
+- double-Esc rewind supports conversation restore, code restore, or both from the same picker
+- pre-response Esc rewind treats a just-submitted query as editable again: the prompt returns to the composer, the interrupted turn is removed from conversation history, and no stale interrupt notice is left behind
+- code restore records per-thread file-history checkpoints before a real user turn can edit files
+- checkpoints are stored under the thread id, so restore still works after quitting and resuming the same session
+- code restore is scoped to tracked edits in the current session thread; it does not reset unrelated sessions or global git state
+
+This keeps rewind close to Claude Code's workflow while preserving Open Codex's session/thread boundaries.
+
+### 7. Reasoning effort controls and per-turn status visibility
 
 From recent fork-specific changes:
 
@@ -141,7 +153,7 @@ From recent fork-specific changes:
 
 This keeps two intent levels separate: `Shift+Tab` is a persistent speed/default switch, while `ulw`/`ultra`/`xhigh` markers stay current-turn-only. The status line describes the active foreground turn without making a temporary marker look like a persistent configuration change.
 
-### 7. Lightweight `/btw` side questions
+### 8. Lightweight `/btw` side questions
 
 From recent fork-specific changes:
 
@@ -151,7 +163,7 @@ From recent fork-specific changes:
 
 This is intended for "by the way" questions that are useful during work but should not become the primary task thread.
 
-### 8. Parallel-first subagent planning policy
+### 9. Parallel-first subagent planning policy
 
 Implemented through the user-scope `~/.codex/AGENTS.md` instruction layer, with an extracted repo example in [`docs/open-codex/parallel-first-agent-execution.md`](docs/open-codex/parallel-first-agent-execution.md):
 
@@ -456,7 +468,19 @@ Codex CLI 是开源的，但上游仓库当前对外部代码贡献采用 invita
 
 这让类似 Claude Code 的会话导出能力直接进入 TUI，而不需要额外脚本或手工抓 transcript。
 
-### 6. Reasoning effort 控制与单 turn 状态可见性
+### 6. Claude Code-style rewind 与持久化代码回滚
+
+来自最近几条 fork 自有改动：
+
+- double-Esc rewind 可以从同一个 picker 里选择只恢复 conversation、只恢复 code，或同时恢复两者
+- pre-response Esc rewind 会把刚提交但尚未产生输出的 query 当作可继续编辑：prompt 回到 composer，interrupted turn 从 conversation history 中移除，并且不会留下过期的 interrupt notice
+- code restore 会在真实 user turn 可能编辑文件前记录 per-thread file-history checkpoint
+- checkpoint 按 thread id 落盘，因此退出并 resume 同一个 session 后仍然可以恢复
+- code restore 只作用于当前 session thread 中被追踪的文件改动，不会 reset 其他 session 或全局 git 状态
+
+这让 rewind 体验更接近 Claude Code，同时保留 Open Codex 的 session/thread 边界。
+
+### 7. Reasoning effort 控制与单 turn 状态可见性
 
 来自最近几条 fork 自有改动：
 
@@ -470,7 +494,7 @@ Codex CLI 是开源的，但上游仓库当前对外部代码贡献采用 invita
 
 这里把两层意图区分开：`Shift+Tab` 是持久化 speed/default switch，而 `ulw`、`ultra`、`xhigh` marker 仍然只影响当前 turn。status line 会描述当前前台 turn，但不会把一次性的 marker 伪装成持久配置变更。
 
-### 7. 轻量 `/btw` side questions
+### 8. 轻量 `/btw` side questions
 
 来自最近几条 fork 自有改动：
 
@@ -480,7 +504,7 @@ Codex CLI 是开源的，但上游仓库当前对外部代码贡献采用 invita
 
 这个能力适合“顺便问一下”的问题：它对当前工作有帮助，但不应该接管主任务线程。
 
-### 8. Parallel-first subagent planning policy
+### 9. Parallel-first subagent planning policy
 
 通过 user-scope `~/.codex/AGENTS.md` 指令层实现，并在 repo 中抽取了示例文件：[`docs/open-codex/parallel-first-agent-execution.md`](docs/open-codex/parallel-first-agent-execution.md)。
 

codex-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonw24/open-codex",
-  "version": "0.131.6",
+  "version": "0.133.3",
   "license": "Apache-2.0",
   "bin": {
     "open-codex": "bin/codex.js"