Open diffs in Neovim native diffs

[ldelossa]

Hello.

I have been using https://github.com/coder/claudecode.nvim to integrate Neovim with ClaudeCode.

However, this plugin does not allow prompting a remote ClaudeCode from inside Neovim. I like running the AI outside of Neovim as it gets too cluttered otherwise for me.

I like that this plugin can send prompts directly to opencode. However, one of the killer features of claudecode.nvim is that claude can talk back to Neovim and have it open neovim native diffs when suggesting changes.

It his possible with opencode.nvim and opencode as well?

[NickvanDyke]

Sorry for the slow response, I didn't realize I don't get notifications for Discussions!

I think this is possible when edits require permission - I could listen for the permission request SSE and display the diff in Neovim, then accept/reject the permission request. However the plugin aims to supplement the opencode TUI, not re-implement functionality (like viewing and responding to diffs). I still think it's a cool idea, but the level of effort is a bit high for me to just knock out on the side. iirc when I toyed with Next Edit Suggestions, my main pain point was that Neovim doesn't offer a standard way to easily display inline diffs (happy to be corrected on that).

[ldelossa]

Not gonna lie, the only thing that stops me from trying this plugin vs Claude + claudecode.nvim is the diff feature. Totally respect the authors opinion and reasoning. But its a must have for me.

[NickvanDyke]

And doing a diff against that snapshot. Then utilizing the OpencodeEvent to automatically prompt to display the diff or something

The SSE permission request for edits includes a unified diff, no need to compute it yourself afaik 🙂 The tricky part is just displaying it. And you can reference existing code for accepting/rejecting it (the permission request).

I'm open to the idea and PRs! I just don't have the capacity to do this myself right now or probably anytime soon.

[ldelossa]

Do you think DiffView https://github.com/sindrets/diffview.nvim could be integrated to do the heavy lifting?

For instance, opencodenvim calls into diffview which naturally displays a diff in a new tab, and registers a autocmd on diffview tab close and buffer write, interpreting the former as rejected and the latter as accepted? I know its not this simple but talking from a very high level.

That way, you can actually keep opencode.nvim agnostic from diff logic, and just "integrate" with popular diff plugins. Id be perfectly happy to pull in a dependency for diff support.

[chuan2984]

@ldelossa I was thinking about using DiffView to do the diff since that seems like the perfect tool for this

I’ve been experimenting with different ways to handle the diff, and because I’ve never used an editor with this kind of “smart” AI integration before, I’m not sure what the best workflow should look like.

Using the approach that @NickvanDyke mentioned—intercepting the permission.edit event—you can choose to accept or reject the agent’s suggested edits. I hacked together a rough version of this, and it does function, but it feels limiting. The main issue is that you’re making accept/reject decisions without seeing the broader context of all the proposed changes across the file.

To make this approach truly usable, you would need file-level visibility into the changes and a way to navigate through proposals (next/previous), similar to reviewing a pull request.

The alternative is to let all suggested changes apply first, then run a complete diff afterward so you can decide what to keep or discard retroactively(mimicking what goose.nvim currently does)

Please let me know what you think~~~~ Otherwise, im just going to keep trying different things and maybe do a draft pr at some point, its quite an interesting problem to tackle

[chuan2984]

hey guys, please take a look at this rough draft when you get a chance, thanks!