aljaz/opencode
1
0
Fork 0
mirror of https://github.com/aljazceru/opencode.git synced 2025-12-21 17:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup diff, cleanup agent

Browse Source
This commit is contained in:
Kujtim Hoxha
2025-04-13 14:37:05 +02:00
parent 3ad983db0f
commit cdc5f209dc
19 changed files with 462 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/git/diff.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/kujtimiihoxha/termai/internal/config"
)
type DiffStats struct {
@@ -197,32 +196,32 @@ func isSplitDiffsAvailable() bool {
}
func formatWithSplitDiffs(diffText string, width int) (string, error) {
var cmd *exec.Cmd
args := []string{
"--color",
}
appCfg := config.Get()
appWd := config.WorkingDirectory()
script := filepath.Join(
appWd,
appCfg.Data.Directory,
"diff",
"index.mjs",
)
var diffCmd *exec.Cmd
cmd = exec.Command("node", script, "--color")
if _, err := exec.LookPath("git-split-diffs-opencode"); err == nil {
fullArgs := append([]string{"git-split-diffs-opencode"}, args...)
diffCmd = exec.Command(fullArgs[0], fullArgs[1:]...)
} else {
npxArgs := append([]string{"git-split-diffs-opencode"}, args...)
diffCmd = exec.Command("npx", npxArgs...)
}
cmd.Env = append(os.Environ(), fmt.Sprintf("COLUMNS=%d", width))
diffCmd.Env = append(os.Environ(), fmt.Sprintf("DIFF_COLUMNS=%d", width))
cmd.Stdin = strings.NewReader(diffText)
diffCmd.Stdin = strings.NewReader(diffText)
var out bytes.Buffer
cmd.Stdout = &out
diffCmd.Stdout = &out
var stderr bytes.Buffer
cmd.Stderr = &stderr
diffCmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
return "", fmt.Errorf("git-split-diffs error: %v, stderr: %s", err, stderr.String())
if err := diffCmd.Run(); err != nil {
return "", fmt.Errorf("git-split-diffs-opencode error: %w, stderr: %s", err, stderr.String())
}
return out.String(), nil