Review panel should support partial staging and diff against staged content

[ifours]

Summary

Add VS Code-style staging to Warp's review panel so users can stage individual lines or hunks, clearly distinguish staged versus unstaged changes, and review later agent edits against the staged baseline instead of always against HEAD.

Problem

The current review workflow does not let users approve only part of an agent's work at line or hunk granularity. That makes it hard to accept the good parts, keep the rest unstaged, and ask the agent to revise only the unapproved portions.

A related problem shows up after partial approval: if a file already has staged changes and the agent edits it again, the review panel should show only the new diff relative to what is already staged, not the full diff relative to HEAD. Without that, it is difficult to tell what changed since the user last approved part of the file.

Reproduction steps or desired workflow

1. Ask the agent to make changes across one or more files.
2. Open the review panel and inspect the diff.
3. Stage only the approved lines or hunks, leaving the rest unstaged.
4. Ask the agent to revise the remaining unstaged portions.
5. If the agent edits a file that already has staged changes, reopen the review panel.
6. The review panel should clearly separate staged versus unstaged content and show only the newly introduced diff against the staged state for that file.

Artifacts

None attached.

Warp version

Unknown

Operating system

macOS

Possible source references

• app/src/code_review/mod.rs: code review panel surface that appears related to review-panel behavior.
• app/src/code_review/diff_state/local.rs: local diff-state handling that seems relevant to HEAD/worktree/index comparisons.
• app/src/util/git.rs: Git helper layer that may be relevant for index-aware staging and staged-vs-unstaged diff computation.
• app/src/workspace/view/right_panel.rs: right-panel integration point that may be involved in presenting review state.

[oz-for-oss]

@ifours

This issue appears to overlap with existing issues:

• Feature Request: Enhance 'Changes' panel with full Git staging, unstaging, and commit capabilities (VS Code-like Source Control UI) #8542 — Feature Request: Enhance 'Changes' panel with full Git staging, unstaging, and commit capabilities (VS Code-like Source Control UI)
• Review Panel - Provide view that filters out staged changes #7570 — Review Panel - Provide view that filters out staged changes
• chunk level diff review, keep and undo #9050 — chunk level diff review, keep and undo
• Add Code Review diff option for unstaged changes only #9673 — Add Code Review diff option for unstaged changes only

If this report is meaningfully different, please comment with the additional context or distinguishing behavior so a maintainer can review it. Otherwise, a maintainer may close it as a duplicate after review.

Maintainer details

I concluded that feature request for VS Code-style partial staging and staged-aware diff baselines in the Code Review panel, which overlaps multiple existing code-review staging requests..

Duplicate reasoning

• Feature Request: Enhance 'Changes' panel with full Git staging, unstaging, and commit capabilities (VS Code-like Source Control UI) #8542: Requests the same broad VS Code-like Git staging and commit workflow for Warp's changes/review surface, including staged versus unstaged handling.
• Review Panel - Provide view that filters out staged changes #7570: Directly overlaps the staged-baseline portion of this request by asking the Review Panel to hide already staged changes and focus on unstaged work, with staging from that view.
• chunk level diff review, keep and undo #9050: Asks for chunk-level review actions analogous to accepting/staging only selected portions of a diff while leaving other changes for further work.
• Add Code Review diff option for unstaged changes only #9673: Requests an unstaged-only Code Review diff source, which is a key piece of separating later unstaged edits from already staged/index content.

This is my automated analysis and may be incorrect. A maintainer will verify the details.

Powered by Oz