Choose between chat reset and file restoration

Understand the approach

The Claude source offers distinct rewind choices for conversation and code. Codex has different documented controls. /new starts a fresh CLI chat, /resume reloads a saved chat, and /fork creates a new chat from history. The desktop’s Undo last app action shortcut is documented, but that wording does not establish a complete rollback of arbitrary files, shell commands or external actions. Use only the behavior you can verify.

If the conversation is confused but the files are correct, start a fresh task with a compact factual handoff. If the files are wrong, inspect their diff and restore only the intended content from a known baseline. Those are different operations. You may keep the full conversation for diagnosis while reverting a local document, or keep a correct implementation while abandoning an unhelpful chat direction.

File restoration can discard work, so first identify and preserve changes outside the experiment. The linked Orbit Notes exercise requires a targeted heading correction while retaining a useful later paragraph; a whole-file restore does not meet that requirement. In a separate case where every working edit to the named tracked file is deliberately rejected, git restore --worktree -- README.md restores the lab’s staged index version. A verified committed baseline can be selected with --source=HEAD only when HEAD actually exists. Neither operation removes new untracked files or reverses remote effects.

Three edits, only one rejected

Keep the corrected check command and append Useful review: preserve this paragraph. Then reject the heading experiment. The wanted document has the original Orbit Notes heading, corrected node command and later paragraph. A targeted heading edit achieves all three.

In a different disposable copy, whole-file restoration from the index removes both unstaged improvements and leaves the untracked draft untouched. The offline verifier executes both transformations and compares actual content. It does not emulate a Codex rewind or claim that chat history changes file state.

The narrowest successful recovery

A small corrective edit can preserve more useful work than whole-file restoration. Inspect its diff and keep a recovery copy if needed. For external effects, use the affected system’s supported correction process within the current authorization.

Try it step by step

1. Classify the problem as incorrect conversation context, incorrect local files or an external action needing separate handling.
2. Inspect the baseline and current diff, and preserve any unrelated edits before choosing the recovery action.
3. For this heading-only Orbit Notes exercise, correct just the rejected heading in the current README; retain the useful paragraph and avoid whole-file restoration.
4. Recheck the recovered behavior and add a factual handoff if a new chat will continue the task.

A useful starting example

Illustration · adapt before use.

Review the changes to README.md in this disposable repository. Compare them with the verified baseline and identify unrelated work. Propose restoring only the rejected heading edit while keeping the useful new paragraph. Show the intended diff before applying it, then verify the final document. Do not reset the whole repository.

git restore --worktree -- README.md

Check your result

• The chosen action matches the state that is actually wrong: conversation, files or external system.
• The useful paragraph and unrelated edits survive the recovery.
• The final file content and relevant check confirm the intended state, with remaining untracked outputs accounted for.

Common mistakes

• Using a repository-wide hard reset for a single rejected edit.
• Assuming Ctrl+Z, /new or /fork provides the same recovery guarantees as Claude’s rewind menu.