Diff mode feedback and improvments

[dtrckd]

Hi there,

thanks for the awesome work.

I write this to address the current limitations of the diff mode and with the hope to build a knowledge base and feedback of this rich feature.
Diff mode is crucial to have a powerful and consistent experience with generative models.

Currently (v17.23.0) the diff mode open a telescope window with the diff to accept or reject. Here are the current limitations I am facing :

• We cannot copy the removed text. This is important when the model make unwanted change/deletion.
• We cannot move between changes
• The text is not collapsed/folded to help see where are the changes
• We cannot accept or reject just the current change, at the cursor (not all changes on the file)
• When a change is rejected, the workflow stop completely.

I was wondering if some shortcuts might be available in order to :

• move to the next/prev diff on the current file, if any.
• accept/reject local change (at cursor).
• edit the change proposed by the model.

[olimorris]

Appreciate you sharing your thoughts. We'll get to this at some point.

[bassamsdata]

I think that’s all very positive and doable suggestions. I’ll work on those additions to the inline diff at some point, but it likely won’t be this month unless someone else picks it up and implements it sooner.

[p135246]

The "inline diff" stopped working for me; only the "floating diff" appears each time.
How can I bring back the inline diff @olimorris ? Thanks!

PS. By "inline diff" I mean displaying changes/approval directly in the edited buffer

Another (probably unrelated) issue after a recent update: the special commands #, @, / are not anymore highlighted. I don't know how to debug it.

[olimorris]

https://codecompanion.olimorris.dev/configuration/chat-buffer.html#diff change it to buffer

Regarding the syntax highlighting. Is this a nightly issue?

[dtrckd]

I'll add a really nice feature in the available choices facing the diffs, is to have another choice Refuse and tell why, to keep going the diff edition workflow but with suggestions for the model for the next try (similar that what Claude code propose).

[olimorris]

This has been raised in #2217. Will get around to adding it at some point. It's a great idea.

[deas]

Hi,

not sure if I am on the same page, but "inline" and "diff" match my issue. :)

Long story short:

Using copilot with its default gpt-4.1, I cannot get "Inline Chat" to display or apply something meaningful to me.

Using the command

CodeCompanion #{buffer} Comment all functions with explanations.

with a basic python file, I see the following:

Asking for the same thing in the chat buffer, I get to see what I believe is "Super Diff" which displays and applies changes perfectly.

[amadeus]

Random question, is there a way to disable super diff? most of the time I just yolo mode stuff, and when I don't I prefer vim's built in diff tool?

[amadeus]

I think what I want from a settings perspective is:

      diff = {
        enabled = true,
        provider = "split",
        provider_opts = {
          split = {
            close_chat_at = 240,
            layout = "vertical",
            opts = { "internal", "filler", "closeoff", "algorithm:histogram", "linematch:120", "iwhiteall" },
          },
        },
      },

but yeah, that appears to not be working at all. It always shows the overlaying floating diff viewer with those settings. Both with claude_code acp and sonnet 4.5 anthropic adapters.

[amadeus]

(also, fwiw, I hope I don't come across as upset or blame-y or inconsiderate. not my intention at all, text can be weird sometimes.)

[bassamsdata]

Not at all, no worries! It didn’t come across that way to me at all.

[bassamsdata]

This has been fixed in #2305, could you please try it out after updating the plugin to the latest main version and let me know if you run into any issues?

[amadeus]

Oh great! Yeah just checked out the latest, looks like my preferred 'split' config is working again, thanks for your help!

[dtrckd]

Hi,

Is there a a way to show/hide the diff window in superdiff mode in order to read the discussion in the chat and come back to the diff window ?

Using move the cursor around but do not hide the diff window who hides the content behind...