Model is unaware of manual editing of diff viewer in IDE

hey @OverHash, this should already be possible. If you edit the proposed content within the diff viewer, your edits should be applied when it saves. Please give it a try and see if that's the case for you!

Hey @hackyon-anthropic, I'll attach some videos to better explain.

https://github.com/user-attachments/assets/07f8cafd-c80d-4b96-b3af-cd7dae81fa94

Video 1 here shows us using Claude Code to add some items to a file, but we make a manual edit (adding strawberry).

First UX problem arises when we accept the proposed changes -- we are also asked by vscode to save the file. I just tested and it seems that no matter what you do, the changes will be saved (which is good, but clunky UI -- would be ideal if vscode didn't prompt to save the file here at all after we accept the changes).

https://github.com/user-attachments/assets/184e6606-8679-46d6-b09c-88f0acf5b2d9

Video 2 here shows proof of rejecting the change doesn't do anything.

However, the core problem remains in either case: vscode applies the manual edits made in the diff viewer, _but the model has no idea about those changes_. this can cause issues because the context the model uses is essentially poisoned.

Here's the full transcript of the conversation:

> Create a new text file called "shopping.txt" and add "mangos, oranges, bananas" to it, each on a new line.

● Write(file_path: shopping.txt)…
  ⎿ Wrote 4 lines to shopping.txt
     mangos
     oranges
     bananas
     strawberry

● Created shopping.txt with the requested items on separate lines.

<-- manual note: this is the result after the first video. we also added strawberry manually -->

> Okay, now remove bananas.

● Update(shopping.txt)…
  ⎿  Updated shopping.txt with 1 addition and 3 removals
     1  mangos
     2  -oranges
     3  -bananas
     4  -strawberry
     2 \ No newline at end of file
     3  +oranges
     4 \ No newline at end of file

● Removed bananas from the shopping list.

<-- manual note: this is the result after the second video. we also manually removed strawberry -->

> What were the changes we just made? Don't do any tool uses

● We created a shopping.txt file with three items (mangos, oranges, bananas) each on separate lines, then removed bananas from the list, leaving only mangos and oranges.

Clearly the model had no idea about strawberries.

This causes problems because as a developer I must then instruct the model to read the file again and look for manual changes I made:

> Did I ever add an extra fruit compared to just mangos, oranges, and bananas as we have discussed?

● No, you never added any extra fruit. We only worked with the three fruits you originally specified: mangos, oranges, and bananas. We created the file with those three items and then removed bananas, leaving
  mangos and oranges.

so although the output of Claude Code _shows_ that during the file write operations we apply the manual edits from vscode git diff, this is not integrated into the model conversation context, and so the model does not understand manual edits made.

Accordingly perhaps this issue should be renamed after my triaging just now. Maybe "Integrate manual edits in diff viewer into model conversation" is more appropriate.

I'm experiencing the same issue, repeatedly, on Windsurf.

Clicking the "approve changes" in the IDE does reflect my changes in the terminal though Windsurf asks me if I want to save my changes (odd).

However, if I modify the suggestion and press one (1) in the terminal, my changes are not saved nor show in the terminal diff. If Claude suggest a change and I edit the file and instead do Cmd+S, it behaves like typing one (1) it proceeds but ignores my changes.

So in conclusion, the only way to have Claude keep my changes in context is by clicking "approve changes" and confirming the save operation on Windsurf (even if the terminal already moved forward).

Enhanced Diff View Integration: Make Claude aware of user edits

I opened a related issue that was closed as duplicate, but I believe this overlaps with the core problem described here.

Current Problem

Claude proposes changes via diff view, but when developers manually edit those changes before accepting, Claude is unaware of the modifications. This leads to Claude saying things like "Wait, it seems like I made a mistake in my last edit" and attempting to undo user improvements.

Proposed Solution

Change Claude Code's assumption from "see if the user agrees to the change" to "incorporate any additional changes or corrections the user makes."

Workflow

1. Direct Edit Support - Allow developers to modify proposed changes in diff view
2. Change Detection - Detect when developers have modified the proposed changes
3. Collaborative Dialog - When modifications are detected, Claude should:

• Acknowledge the developer's changes
• Ask clarifying questions about the intent
• Incorporate refinements into the final implementation
• Generalize the pattern to other applicable locations

Why This Matters

• Enables "show, don't tell" collaboration through concrete code changes
• Creates tighter feedback loops between human and AI
• Reduces back-and-forth prompt iterations
• Allows complex requirements to be communicated through example modifications

Use Case Example

1. Claude proposes a function implementation
2. Developer sees it's 90% correct but tweaks the error handling in diff view
3. Claude recognizes the modification: "I see you changed the error handling approach - would you like me to apply this pattern to similar functions?"
4. Developer confirms, Claude applies the refined approach consistently

Suggested thread title: Feature Request: Enable Claude awareness of user edits in VS Code Diff View

Even in 1.0.126, Claude always writes its originally suggested code changes despite me making changes within the VS Code diff editor.

1) Claude suggestion within VS Code diff:
"Foo"

2) User edit to Claude suggestion within VS Code diff:
"Foo Bar"

3) User manually accepts change

4) Claude still writes "Foo"

Even in 1.0.126, Claude always writes its originally suggested code changes despite me making changes within the VS Code diff editor. 1. Claude suggestion within VS Code diff: "Foo" 2. User edit to Claude suggestion within VS Code diff: "Foo Bar" 3. User manually accepts change 4. Claude still writes "Foo"

In my case, it seems to assume that it had made a mistake, which means it is not made aware of this diff view as an opportunity to give feedback, which is the issue.

This issue has been inactive for 30 days. If the issue is still occurring, please comment to let us know. Otherwise, this issue will be automatically closed in 30 days for housekeeping purposes.

Still an issue in VS Code with Claude Extension. Also "Accept Changes" button in VS Code sometimes breaks. Seems more likely when I have edited the diff code, but does happen occasionally when I have not edited the diff.

Worse, not only will the chat not notice the changes I made upon acceptance (simpler) or while making them (harder), if I make changes and then say "Accept changes" in the GUI Claude chat by clicking the button or reactivating the chat window and pressing Enter, Claude overwrites my changes I just made in the diff view. (I'm sure it's just kicking out the changes to the GUI for us to view on the front end and isn't "seeing my edits and choosing to overwrite anyway" but that's what it "feels" like as a user. Frustrating UX, but still very grateful for the tool!

Thanks Anthropic team.

Can confirm this is still an issue and is EXTREMELY frustrating costing me hours of time. thanks for your attention to this guys

Can confirm. Is something that Cline (with Claude or any of the other models) _does_ support.

This issue has been automatically closed due to 60 days of inactivity. If you're still experiencing this issue, please open a new issue with updated information.

This issue was closed incorrectly despite recent human comments. This behavior of the bot is reported at https://github.com/anthropics/claude-code/issues/16497. Please upvote that issue, so maybe it gets noticed.

This issue has been automatically closed due to 60 days of inactivity. If you're still experiencing this issue, please open a new issue with updated information.

You are wrong. @github-actions @github. #reopen /reopen
--reopen #open /open --open :)

Check the dates of the humans posting comments (ie. activity) more thoroughly.

This issue has been automatically locked since it was closed and has not had any activity for 7 days. If you're experiencing a similar issue, please file a new issue and reference this one if it's relevant.