Merge pull request #198 from batrachianai/diff-diff

Diff diff

Author: willmcgugan

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.33] - 2027-01-16
+
+### Fixed
+
+- Fixed character level diff highlights
 
 ## [0.5.32] - 2027-01-15
 
@@ -242,6 +247,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - First release. This document will be updated for subsequent releases.
 
+[0.5.33]: https://github.com/batrachianai/toad/compare/v0.5.32...v0.5.33
 [0.5.32]: https://github.com/batrachianai/toad/compare/v0.5.31...v0.5.32
 [0.5.31]: https://github.com/batrachianai/toad/compare/v0.5.30...v0.5.31
 [0.5.30]: https://github.com/batrachianai/toad/compare/v0.5.29...v0.5.30

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "batrachian-toad"
-version = "0.5.32"
+version = "0.5.33"
 description = "A unified experience for AI in your terminal."
 readme = "README.md"
 requires-python = ">=3.14"

src/toad/data/agents/opencode.ai.toml

@@ -18,8 +18,6 @@ run_command."*" = "opencode acp"
 help = '''
 # OpenCode
 
-**The AI coding agent built for the terminal**
-
 OpenCode is an open source agent that helps you write and run code directly from the terminal with a flexible client/server architecture.
 
 ## Key Features
@@ -29,31 +27,11 @@ OpenCode is an open source agent that helps you write and run code directly from
 - **Multi-LLM Support**: Works with various AI providers
 - **GitHub Integration**: Deep integration with GitHub workflows
 
-## ACP Integration
-
-OpenCode supports the Agent Client Protocol via the **opencode-acp** adapter by josephschmitt. This adapter:
-- Launches a per-session MCP HTTP server
-- Proxies file and terminal actions back to ACP
-- Translates OpenCode streaming updates to ACP notifications
-- Enables OpenCode to work with ACP-compatible editors
-
-The ACP adapter allows standardized communication between OpenCode and various development tools.
-
-## Installation
-
-Install OpenCode globally:
-```bash
-npm install -g opencode
-```
-
-For ACP support, install the adapter from:
-https://github.com/josephschmitt/opencode-acp
-
 ---
 
 **Website**: https://opencode.ai/  
 **GitHub**: https://github.com/sst/opencode  
-**ACP Adapter**: https://github.com/josephschmitt/opencode-acp
+
 '''
 
 [actions."*".install]

src/toad/widgets/diff_view.py

@@ -310,6 +310,38 @@ def counts(self) -> tuple[int, int]:
                     additions += 1
         return additions, removals
 
+    @classmethod
+    def _highlight_diff_lines(
+        cls, lines_a: list[Content], lines_b: list[Content]
+    ) -> tuple[list[Content], list[Content]]:
+        """Diff two groups of lines.
+
+        Args:
+            lines_a: Lines before.
+            lines_b: Lines after
+
+        Returns:
+            A pair of highlighted lists of lines.
+        """
+        code_a = Content("\n").join(content for content in lines_a)
+        code_b = Content("\n").join(content for content in lines_b)
+        sequence_matcher = difflib.SequenceMatcher(
+            lambda character: character in " \t",
+            code_a.plain,
+            code_b.plain,
+            autojunk=True,
+        )
+        spans_a: list[Span] = []
+        spans_b: list[Span] = []
+        for tag, i1, i2, j1, j2 in sequence_matcher.get_opcodes():
+            if tag in {"delete", "replace"}:
+                spans_a.append(Span(i1, i2, "on $error 40%"))
+            if tag in {"insert", "replace"}:
+                spans_b.append(Span(j1, j2, "on $success 40%"))
+        diffed_lines_a = code_a.add_spans(spans_a).split("\n")
+        diffed_lines_b = code_b.add_spans(spans_b).split("\n")
+        return diffed_lines_a, diffed_lines_b
+
     @property
     def highlighted_code_lines(self) -> tuple[list[Content], list[Content]]:
         """Get syntax highlighted code for both files, as a list of lines.
@@ -331,35 +363,21 @@ def highlighted_code_lines(self) -> tuple[list[Content], list[Content]]:
                 "\n".join(text_lines_b), language=language2, path=self.path2
             )
 
-            if self.code_before:
-
-                sequence_matcher = difflib.SequenceMatcher(
-                    lambda character: character in " \t",
-                    code_a.plain,
-                    code_b.plain,
-                    autojunk=True,
-                )
-                code_a_spans: list[Span] = []
-                code_b_spans: list[Span] = []
-
-                for tag, i1, i2, j1, j2 in sequence_matcher.get_opcodes():
-                    if (
-                        tag in {"delete", "replace"}
-                        and "\n" not in code_a.plain[i1 : i2 + 1]
-                    ):
-                        code_a_spans.append(Span(i1, i2, "on $error 40%"))
-                    if (
-                        tag in {"insert", "replace"}
-                        and "\n" not in code_b.plain[j1 : j2 + 1]
-                    ):
-                        code_b_spans.append(Span(j1, j2, "on $success 40%"))
-
-                code_a = code_a.add_spans(code_a_spans)
-                code_b = code_b.add_spans(code_b_spans)
-
             lines_a = code_a.split("\n")
             lines_b = code_b.split("\n")
+
+            if self.code_before:
+                for group in self.grouped_opcodes:
+                    for tag, i1, i2, j1, j2 in group:
+                        if tag == "replace" and (j2 - j1) / (i2 - i1) <= 1.5:
+                            diff_lines_a, diff_lines_b = self._highlight_diff_lines(
+                                lines_a[i1:i2], lines_b[j1:j2]
+                            )
+                            lines_a[i1:i2] = diff_lines_a
+                            lines_b[j1:j2] = diff_lines_b
+
             self._highlighted_code_lines = (lines_a, lines_b)
+
         return self._highlighted_code_lines
 
     def get_title(self) -> Content: