[FEATURE] Inline line-anchored comments on plans and diffs at the approval prompt (TUI)

Preflight Checklist

• [x] I have searched existing requests and this feature hasn't been requested yet (closest matches are #45904 and #64207, both auto-closed as stale with an invitation to open a new issue; see Additional Context)
• [x] This is a single feature request (not multiple features)

Problem Statement

When Claude presents a plan (plan mode) or a diff (edit/write permission prompt) in the terminal, the only way to give feedback is the single free-text prompt. Claude can generate quite a bit of content, and my actual feedback is usually anchored to specific lines: "this step is wrong", "should this really live on the session?", "this branch is out of scope".

Today that means, for every remark I have: scroll up, find the passage, copy it, scroll back down, paste it into a > quote block, then write my point under it. Repeat for each remark. It works, but it is a lot of mechanical effort for what is conceptually "leave a review comment on line N", and it breaks the flow of reading the plan or diff top to bottom.

The Desktop app's Code tab reportedly supports selecting text and leaving a comment, and the VS Code extension has inline plan comments, but I use the native CLI because none of the editors or IDEs offer quite the experience I like from Claude Code. Third-party plugins (e.g. revdiff) exist but feel janky.

Proposed Solution

Add a review/annotate option to the plan approval and diff permission prompts. Where today the selector offers "Yes and go into auto mode / Yes, <reason> / No / No, <reason>", add a new option (could be gated behind a config flag so the default prompt stays unchanged) such as "Review inline".

Choosing it would:

1. Move focus onto the lines of the plan or the diff, navigable with the keyboard (arrow keys or j/k).
2. On a keybind (e.g. c), open a small input to type a comment attached to the current line.
3. Ideally also allow selecting a range of lines (e.g. v / Shift+arrows) before commenting, so a remark can refer to a whole step or hunk, giving Claude more context on what I mean.
4. Show the comments in place (marker or highlighted line) so I can see what I have already flagged while I keep reading.
5. Comments accumulate. When done, I send them all at once, the same way I send a single message today, optionally together with a general summary comment.

On submit, Claude would receive the feedback in a structured form. The simplest version is literally what I do by hand today:

> 3. Session stores the correlation ID from that point on.

Should this be stored on the session? Wouldn't it get lost when ...

But a smarter encoding (line numbers or hunk references, fewer tokens, easier for the model to reason about) would be fine too, as long as each comment stays anchored to the exact spot it refers to.

Alternative Solutions

• Manual quoting in the prompt (current workaround; described above).
• The revdiff plugin: gets partway there, but the experience is janky compared to native prompt handling.
• Desktop app Code tab / VS Code extension inline plan comments: not applicable if you want to stay in the terminal.
• A lighter first step would be stable line/block references (e.g. [L12], [H3]) rendered next to plan lines and diff hunks that I can quote in the prompt without copy-pasting the text.

Priority

Medium - Would be very helpful

Feature Category

Interactive mode (TUI)

Use Case Example

1. I ask Claude to plan a change; it produces a 60-line plan in plan mode.
2. Steps 1, 2, 4 and 5 are fine. Step 3 makes an assumption I disagree with, and step 6 is out of scope.
3. I pick "Review inline", navigate to step 3, press c, type "Should this be stored on the session? ...", navigate to step 6, press c, type "Out of scope for this ticket, drop it".
4. I submit. Claude receives both comments anchored to their lines and revises exactly those steps in one turn.
5. Same flow on a diff at the edit permission prompt: select the three lines of a hunk, comment "use the existing helper instead", reject-with-feedback in one go.

Additional Context

• Essentially what AI-first editors and Codex already do (anchored, numbered annotations, batch submit), but in the CLI.
• Prior requests for the same idea: #45904 (canonical, closed as stale) and #64207 (consolidation of #45904, #60891, #58336, #47906, also closed as stale). None were rejected on the merits; the bot explicitly invited a new issue.
• Related open issues: #95733 and #94625 ask for accumulating multi-select quote replies on Claude's responses. This request is the counterpart for the plan/diff approval prompts specifically, with keyboard line navigation instead of mouse text selection. #82643 asks for the VS Code plan-comment UI to extend to arbitrary markdown files.