From ddd2595b104ac83d653d8396e1f2a34741814999 Mon Sep 17 00:00:00 2001 From: Cal Irvine Date: Mon, 29 Sep 2025 16:41:54 -0400 Subject: [PATCH 1/2] Fix relative paths for getGitFiles --- packages/tui/internal/completions/files.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/tui/internal/completions/files.go b/packages/tui/internal/completions/files.go index d00873656bc..1f9265d86d7 100644 --- a/packages/tui/internal/completions/files.go +++ b/packages/tui/internal/completions/files.go @@ -3,6 +3,8 @@ package completions import ( "context" "log/slog" + "os" + "path/filepath" "sort" "strconv" "strings" @@ -37,11 +39,21 @@ func (cg *filesContextGroup) getGitFiles() []CompletionSuggestion { }) for _, file := range files { + // Convert path from relative to git repo root to relative to current working directory + relativePath := file.Path + if cwd, err := os.Getwd(); err == nil { + if absPath := filepath.Join(cg.app.Project.Worktree, file.Path); absPath != "" { + if relPath, err := filepath.Rel(cwd, absPath); err == nil { + relativePath = relPath + } + } + } + displayFunc := func(s styles.Style) string { t := theme.CurrentTheme() green := s.Foreground(t.Success()).Render red := s.Foreground(t.Error()).Render - display := file.Path + display := relativePath if file.Added > 0 { display += green(" +" + strconv.Itoa(int(file.Added))) } @@ -52,7 +64,7 @@ func (cg *filesContextGroup) getGitFiles() []CompletionSuggestion { } item := CompletionSuggestion{ Display: displayFunc, - Value: file.Path, + Value: relativePath, ProviderID: cg.GetId(), RawData: file, } From f4bb35a000580d14f07987cb6889e29c1e9ca292 Mon Sep 17 00:00:00 2001 From: Cal Irvine Date: Mon, 29 Sep 2025 17:31:28 -0400 Subject: [PATCH 2/2] Update packages/tui/internal/completions/files.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- packages/tui/internal/completions/files.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tui/internal/completions/files.go b/packages/tui/internal/completions/files.go index 1f9265d86d7..01119037e6a 100644 --- a/packages/tui/internal/completions/files.go +++ b/packages/tui/internal/completions/files.go @@ -38,10 +38,11 @@ func (cg *filesContextGroup) getGitFiles() []CompletionSuggestion { return files[i].Added+files[i].Removed > files[j].Added+files[j].Removed }) + cwd, err := os.Getwd() for _, file := range files { // Convert path from relative to git repo root to relative to current working directory relativePath := file.Path - if cwd, err := os.Getwd(); err == nil { + if err == nil { if absPath := filepath.Join(cg.app.Project.Worktree, file.Path); absPath != "" { if relPath, err := filepath.Rel(cwd, absPath); err == nil { relativePath = relPath