8d735d6 · crush · git.iko.soy

internal/config/load.go+3−2

compare with main

unifiedsplit

@@ -16,6 +16,7 @@ import (

16 "github.com/charmbracelet/crush/internal/csync"

17 "github.com/charmbracelet/crush/internal/env"

18 "github.com/charmbracelet/crush/internal/fsext"

19+ "github.com/charmbracelet/crush/internal/home"

19 "github.com/charmbracelet/crush/internal/log"

20 "github.com/charmbracelet/crush/internal/log"

20)

21)

21

22

@@ -584,7 +585,7 @@ func globalConfig() string {

584 return filepath.Join(localAppData, appName, fmt.Sprintf("%s.json", appName))

585 return filepath.Join(localAppData, appName, fmt.Sprintf("%s.json", appName))

585 }

586 }

586

587

587− return filepath.Join(os.Getenv("HOME"), ".config", appName, fmt.Sprintf("%s.json", appName))

588+ return filepath.Join(home.Dir(), ".config", appName, fmt.Sprintf("%s.json", appName))

588}

589}

589

590

590// GlobalConfigData returns the path to the main data directory for the application.

591// GlobalConfigData returns the path to the main data directory for the application.

@@ -606,5 +607,5 @@ func GlobalConfigData() string {

606 return filepath.Join(localAppData, appName, fmt.Sprintf("%s.json", appName))

607 return filepath.Join(localAppData, appName, fmt.Sprintf("%s.json", appName))

607 }

608 }

608

609

609− return filepath.Join(os.Getenv("HOME"), ".local", "share", appName, fmt.Sprintf("%s.json", appName))

610+ return filepath.Join(home.Dir(), ".local", "share", appName, fmt.Sprintf("%s.json", appName))

610}

611}

internal/config/provider.go+2−1

@@ -12,6 +12,7 @@ import (

12 "time"

13

14 "github.com/charmbracelet/catwalk/pkg/catwalk"

15+ "github.com/charmbracelet/crush/internal/home"

15)

16)

16

17

17type ProviderClient interface {

18type ProviderClient interface {

@@ -41,7 +42,7 @@ func providerCacheFileData() string {

41 return filepath.Join(localAppData, appName, "providers.json")

42 return filepath.Join(localAppData, appName, "providers.json")

42 }

43 }

43

44

44− return filepath.Join(os.Getenv("HOME"), ".local", "share", appName, "providers.json")

45+ return filepath.Join(home.Dir(), ".local", "share", appName, "providers.json")

45}

46}

46

47

47func saveProvidersInCache(path string, providers []catwalk.Provider) error {

48func saveProvidersInCache(path string, providers []catwalk.Provider) error {

internal/fsext/fileutil.go+2−6

@@ -10,6 +10,7 @@ import (

10

11 "github.com/bmatcuk/doublestar/v4"

12 "github.com/charlievieth/fastwalk"

13+ "github.com/charmbracelet/crush/internal/home"

13

14

14 ignore "github.com/sabhiram/go-gitignore"

15 ignore "github.com/sabhiram/go-gitignore"

15)

16)

@@ -182,12 +183,7 @@ func GlobWithDoubleStar(pattern, searchPath string, limit int) ([]string, bool,

182}

183}

183

184

184func PrettyPath(path string) string {

185func PrettyPath(path string) string {

185− // replace home directory with ~

186− homeDir, err := os.UserHomeDir()

187− if err == nil {

188− path = strings.ReplaceAll(path, homeDir, "~")

189− }

190− return path

186+ return home.Short(path)

191}

187}

192

188

193func DirTrim(pwd string, lim int) string {

189func DirTrim(pwd string, lim int) string {

internal/fsext/home.godeleted−20

@@ -1,20 +0,0 @@

1−package fsext

2−

3−import (

4− "cmp"

5− "os"

6− "os/user"

7− "sync"

8−)

9−

10−var HomeDir = sync.OnceValue(func() string {

11− u, err := user.Current()

12− if err == nil {

13− return u.HomeDir

14− }

15− return cmp.Or(

16− os.Getenv("HOME"),

17− os.Getenv("USERPROFILE"),

18− os.Getenv("HOMEPATH"),

19− )

20−})

internal/fsext/ls.go+2−1

@@ -9,6 +9,7 @@ import (

9

10 "github.com/charlievieth/fastwalk"

11 "github.com/charmbracelet/crush/internal/csync"

12+ "github.com/charmbracelet/crush/internal/home"

12 ignore "github.com/sabhiram/go-gitignore"

13 ignore "github.com/sabhiram/go-gitignore"

13)

14)

14

15

@@ -73,7 +74,7 @@ var commonIgnorePatterns = sync.OnceValue(func() ignore.IgnoreParser {

73})

74})

74

75

75var homeIgnore = sync.OnceValue(func() ignore.IgnoreParser {

76var homeIgnore = sync.OnceValue(func() ignore.IgnoreParser {

76− home := HomeDir()

77+ home := home.Dir()

77 var lines []string

78 var lines []string

78 for _, name := range []string{

79 for _, name := range []string{

79 filepath.Join(home, ".gitignore"),

80 filepath.Join(home, ".gitignore"),

internal/fsext/parent.go+3−1

@@ -4,6 +4,8 @@ import (

4 "errors"

5 "os"

6 "path/filepath"

7+

8+ "github.com/charmbracelet/crush/internal/home"

7)

9)

8

10

9// SearchParent searches for a target file or directory starting from dir

11// SearchParent searches for a target file or directory starting from dir

@@ -33,7 +35,7 @@ func SearchParent(dir, target string) (string, bool) {

33

35

34 for {

36 for {

35 parent := filepath.Dir(previousParent)

37 parent := filepath.Dir(previousParent)

36− if parent == previousParent || parent == HomeDir() {

38+ if parent == previousParent || parent == home.Dir() {

37 return "", false

39 return "", false

38 }

40 }

39

41

internal/home/home.gonew file+42

@@ -0,0 +1,42 @@

1+package home

2+

3+import (

4+ "log/slog"

5+ "os"

6+ "path/filepath"

7+ "strings"

8+ "sync"

9+)

10+

11+// Dir returns the users home directory, or if it fails, tries to create a new

12+// temporary directory and use that instead.

13+var Dir = sync.OnceValue(func() string {

14+ home, err := os.UserHomeDir()

15+ if err == nil {

16+ slog.Debug("user home directory", "home", home)

17+ return home

18+ }

19+ tmp, err := os.MkdirTemp("crush", "")

20+ if err != nil {

21+ slog.Error("could not find the user home directory")

22+ return ""

23+ }

24+ slog.Warn("could not find the user home directory, using a temporary one", "home", tmp)

25+ return tmp

26+})

27+

28+// Short replaces the actual home path from [Dir] with `~`.

29+func Short(p string) string {

30+ if !strings.HasPrefix(p, Dir()) || Dir() == "" {

31+ return p

32+ }

33+ return filepath.Join("~", strings.TrimPrefix(p, Dir()))

34+}

35+

36+// Long replaces the `~` with actual home path from [Dir].

37+func Long(p string) string {

38+ if !strings.HasPrefix(p, "~") || Dir() == "" {

39+ return p

40+ }

41+ return strings.Replace(p, "~", Dir(), 1)

42+}

internal/home/home_test.gonew file+26

@@ -0,0 +1,26 @@

1+package home

2+

3+import (

4+ "path/filepath"

5+ "testing"

6+

7+ "github.com/stretchr/testify/require"

8+)

9+

10+func TestDir(t *testing.T) {

11+ require.NotEmpty(t, Dir())

12+}

13+

14+func TestShort(t *testing.T) {

15+ d := filepath.Join(Dir(), "documents", "file.txt")

16+ require.Equal(t, filepath.FromSlash("~/documents/file.txt"), Short(d))

17+ ad := filepath.FromSlash("/absolute/path/file.txt")

18+ require.Equal(t, ad, Short(ad))

19+}

20+

21+func TestLong(t *testing.T) {

22+ d := filepath.FromSlash("~/documents/file.txt")

23+ require.Equal(t, filepath.Join(Dir(), "documents", "file.txt"), Long(d))

24+ ad := filepath.FromSlash("/absolute/path/file.txt")

25+ require.Equal(t, ad, Long(ad))

26+}

internal/llm/prompt/prompt.go+2−12

@@ -9,6 +9,7 @@ import (

9 "github.com/charmbracelet/crush/internal/config"

10 "github.com/charmbracelet/crush/internal/csync"

11 "github.com/charmbracelet/crush/internal/env"

12+ "github.com/charmbracelet/crush/internal/home"

12)

13)

13

14

14type PromptID string

15type PromptID string

@@ -44,18 +45,7 @@ func getContextFromPaths(workingDir string, contextPaths []string) string {

44

45

45// expandPath expands ~ and environment variables in file paths

46// expandPath expands ~ and environment variables in file paths

46func expandPath(path string) string {

47func expandPath(path string) string {

47− // Handle tilde expansion

48+ path = home.Long(path)

48− if strings.HasPrefix(path, "~/") {

49− homeDir, err := os.UserHomeDir()

50− if err == nil {

51− path = filepath.Join(homeDir, path[2:])

52− }

53− } else if path == "~" {

54− homeDir, err := os.UserHomeDir()

55− if err == nil {

56− path = homeDir

57− }

58− }

59

49

60 // Handle environment variable expansion using the same pattern as config

50 // Handle environment variable expansion using the same pattern as config

61 if strings.HasPrefix(path, "$") {

51 if strings.HasPrefix(path, "$") {

internal/llm/prompt/prompt_test.go+4−58

@@ -2,10 +2,10 @@ package prompt

2

3import (

4 "os"

5− "path/filepath"

6− "runtime"

7 "strings"

5 "strings"

8 "testing"

6 "testing"

7+

8+ "github.com/charmbracelet/crush/internal/home"

9)

10

11func TestExpandPath(t *testing.T) {

@@ -25,16 +25,14 @@ func TestExpandPath(t *testing.T) {

25 name: "tilde expansion",

26 input: "~/documents",

27 expected: func() string {

28− home, _ := os.UserHomeDir()

29− return filepath.Join(home, "documents")

28+ return home.Dir() + "/documents"

30 },

29 },

31 },

30 },

32 {

31 {

33 name: "tilde only",

32 name: "tilde only",

34 input: "~",

33 input: "~",

35 expected: func() string {

34 expected: func() string {

36− home, _ := os.UserHomeDir()

35+ return home.Dir()

37− return home

38 },

36 },

39 },

37 },

40 {

38 {

@@ -69,55 +67,3 @@ func TestExpandPath(t *testing.T) {

69 })

67 })

70 }

68 }

71}

69}

72−

73−func TestProcessContextPaths(t *testing.T) {

74− // Create a temporary directory and file for testing

75− tmpDir := t.TempDir()

76− testFile := filepath.Join(tmpDir, "test.txt")

77− testContent := "test content"

78−

79− err := os.WriteFile(testFile, []byte(testContent), 0o644)

80− if err != nil {

81− t.Fatalf("Failed to create test file: %v", err)

82− }

83−

84− // Test with absolute path to file

85− result := processContextPaths("", []string{testFile})

86− expected := "# From:" + testFile + "\n" + testContent

87−

88− if result != expected {

89− t.Errorf("processContextPaths with absolute path failed.\nGot: %q\nWant: %q", result, expected)

90− }

91−

92− // Test with directory path (should process all files in directory)

93− result = processContextPaths("", []string{tmpDir})

94− if !strings.Contains(result, testContent) {

95− t.Errorf("processContextPaths with directory path failed to include file content")

96− }

97−

98− // Test with tilde expansion (if we can create a file in home directory)

99− tmpDir = t.TempDir()

100− setHomeEnv(t, tmpDir)

101− homeTestFile := filepath.Join(tmpDir, "crush_test_file.txt")

102− err = os.WriteFile(homeTestFile, []byte(testContent), 0o644)

103− if err == nil {

104− defer os.Remove(homeTestFile) // Clean up

105−

106− tildeFile := "~/crush_test_file.txt"

107− result = processContextPaths("", []string{tildeFile})

108− expected = "# From:" + homeTestFile + "\n" + testContent

109−

110− if result != expected {

111− t.Errorf("processContextPaths with tilde expansion failed.\nGot: %q\nWant: %q", result, expected)

112− }

113− }

114−}

115−

116−func setHomeEnv(tb testing.TB, path string) {

117− tb.Helper()

118− key := "HOME"

119− if runtime.GOOS == "windows" {

120− key = "USERPROFILE"

121− }

122− tb.Setenv(key, path)

123−}

internal/tui/components/chat/sidebar/sidebar.go+2−8

@@ -3,7 +3,6 @@ package sidebar

3import (

4 "context"

5 "fmt"

6− "os"

7 "slices"

6 "slices"

8 "strings"

7 "strings"

9

8

@@ -14,6 +13,7 @@ import (

14 "github.com/charmbracelet/crush/internal/diff"

13 "github.com/charmbracelet/crush/internal/diff"

15 "github.com/charmbracelet/crush/internal/fsext"

14 "github.com/charmbracelet/crush/internal/fsext"

16 "github.com/charmbracelet/crush/internal/history"

15 "github.com/charmbracelet/crush/internal/history"

16+ "github.com/charmbracelet/crush/internal/home"

17 "github.com/charmbracelet/crush/internal/lsp"

18 "github.com/charmbracelet/crush/internal/pubsub"

19 "github.com/charmbracelet/crush/internal/session"

@@ -609,11 +609,5 @@ func (m *sidebarCmp) SetCompactMode(compact bool) {

609func cwd() string {

610 cwd := config.Get().WorkingDir()

611 t := styles.CurrentTheme()

612− // Replace home directory with ~, unless we're at the top level of the

613− // home directory).

614− homeDir, err := os.UserHomeDir()

615− if err == nil && cwd != homeDir {

616− cwd = strings.ReplaceAll(cwd, homeDir, "~")

617− }

618− return t.S().Muted.Render(cwd)

612+ return t.S().Muted.Render(home.Short(cwd))

619}

613}

internal/tui/components/chat/splash/splash.go+2−7

@@ -2,7 +2,6 @@ package splash

2

3import (

4 "fmt"

5− "os"

6 "strings"

5 "strings"

7 "time"

6 "time"

8

7

@@ -11,6 +10,7 @@ import (

11 tea "github.com/charmbracelet/bubbletea/v2"

10 tea "github.com/charmbracelet/bubbletea/v2"

12 "github.com/charmbracelet/catwalk/pkg/catwalk"

11 "github.com/charmbracelet/catwalk/pkg/catwalk"

13 "github.com/charmbracelet/crush/internal/config"

12 "github.com/charmbracelet/crush/internal/config"

13+ "github.com/charmbracelet/crush/internal/home"

14 "github.com/charmbracelet/crush/internal/llm/prompt"

15 "github.com/charmbracelet/crush/internal/tui/components/chat"

16 "github.com/charmbracelet/crush/internal/tui/components/core"

@@ -648,12 +648,7 @@ func (s *splashCmp) cwdPart() string {

648}

649

650func (s *splashCmp) cwd() string {

651− cwd := config.Get().WorkingDir()

651+ return home.Short(config.Get().WorkingDir())

652− homeDir, err := os.UserHomeDir()

653− if err == nil && cwd != homeDir {

654− cwd = strings.ReplaceAll(cwd, homeDir, "~")

655− }

656− return cwd

657}

652}

658

653

659func LSPList(maxWidth int) []string {

654func LSPList(maxWidth int) []string {

internal/tui/components/dialogs/commands/loader.go+3−2

@@ -10,6 +10,7 @@ import (

10

11 tea "github.com/charmbracelet/bubbletea/v2"

12 "github.com/charmbracelet/crush/internal/config"

13+ "github.com/charmbracelet/crush/internal/home"

13 "github.com/charmbracelet/crush/internal/tui/util"

14 "github.com/charmbracelet/crush/internal/tui/util"

14)

15)

15

16

@@ -54,7 +55,7 @@ func buildCommandSources(cfg *config.Config) []commandSource {

54 }

55 }

55

56

56 // Home directory

57 // Home directory

57− if home, err := os.UserHomeDir(); err == nil {

58+ if home := home.Dir(); home != "" {

58 sources = append(sources, commandSource{

59 sources = append(sources, commandSource{

59 path: filepath.Join(home, ".crush", "commands"),

60 path: filepath.Join(home, ".crush", "commands"),

60 prefix: UserCommandPrefix,

61 prefix: UserCommandPrefix,

@@ -73,7 +74,7 @@ func buildCommandSources(cfg *config.Config) []commandSource {

73func getXDGCommandsDir() string {

74func getXDGCommandsDir() string {

74 xdgHome := os.Getenv("XDG_CONFIG_HOME")

75 xdgHome := os.Getenv("XDG_CONFIG_HOME")

75 if xdgHome == "" {

76 if xdgHome == "" {

76− if home, err := os.UserHomeDir(); err == nil {

77+ if home := home.Dir(); home != "" {

77 xdgHome = filepath.Join(home, ".config")

78 xdgHome = filepath.Join(home, ".config")

78 }

79 }

80 }

internal/tui/components/dialogs/filepicker/filepicker.go+3−3

@@ -11,6 +11,7 @@ import (

11 "github.com/charmbracelet/bubbles/v2/help"

12 "github.com/charmbracelet/bubbles/v2/key"

13 tea "github.com/charmbracelet/bubbletea/v2"

14+ "github.com/charmbracelet/crush/internal/home"

14 "github.com/charmbracelet/crush/internal/message"

15 "github.com/charmbracelet/crush/internal/message"

15 "github.com/charmbracelet/crush/internal/tui/components/core"

16 "github.com/charmbracelet/crush/internal/tui/components/core"

16 "github.com/charmbracelet/crush/internal/tui/components/dialogs"

17 "github.com/charmbracelet/crush/internal/tui/components/dialogs"

@@ -60,7 +61,7 @@ func NewFilePickerCmp(workingDir string) FilePicker {

60 if cwd, err := os.Getwd(); err == nil {

61 if cwd, err := os.Getwd(); err == nil {

61 fp.CurrentDirectory = cwd

62 fp.CurrentDirectory = cwd

62 } else {

63 } else {

63− fp.CurrentDirectory, _ = os.UserHomeDir()

64+ fp.CurrentDirectory = home.Dir()

64 }

65 }

66 }

66

67

@@ -106,8 +107,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

106 }

107 }

107 if key.Matches(msg, m.filePicker.KeyMap.Back) {

108 if key.Matches(msg, m.filePicker.KeyMap.Back) {

108 // make sure we don't go back if we are at the home directory

109 // make sure we don't go back if we are at the home directory

109− homeDir, _ := os.UserHomeDir()

110− if m.filePicker.CurrentDirectory == homeDir {

110+ if m.filePicker.CurrentDirectory == home.Dir() {

111 return m, nil

112 }

113 }

internal/tui/components/dialogs/models/apikey.go+2−3

@@ -2,13 +2,12 @@ package models

2

3import (

4 "fmt"

5− "strings"

6

5

7 "github.com/charmbracelet/bubbles/v2/spinner"

6 "github.com/charmbracelet/bubbles/v2/spinner"

8 "github.com/charmbracelet/bubbles/v2/textinput"

7 "github.com/charmbracelet/bubbles/v2/textinput"

9 tea "github.com/charmbracelet/bubbletea/v2"

8 tea "github.com/charmbracelet/bubbletea/v2"

10 "github.com/charmbracelet/crush/internal/config"

9 "github.com/charmbracelet/crush/internal/config"

11− "github.com/charmbracelet/crush/internal/fsext"

10+ "github.com/charmbracelet/crush/internal/home"

12 "github.com/charmbracelet/crush/internal/tui/styles"

11 "github.com/charmbracelet/crush/internal/tui/styles"

13 "github.com/charmbracelet/lipgloss/v2"

12 "github.com/charmbracelet/lipgloss/v2"

14)

13)

@@ -145,7 +144,7 @@ func (a *APIKeyInput) View() string {

145 inputView := a.input.View()

144 inputView := a.input.View()

146

145

147 dataPath := config.GlobalConfigData()

146 dataPath := config.GlobalConfigData()

148− dataPath = strings.Replace(dataPath, fsext.HomeDir(), "~", 1)

147+ dataPath = home.Short(dataPath)

149 helpText := styles.CurrentTheme().S().Muted.

148 helpText := styles.CurrentTheme().S().Muted.

150 Render(fmt.Sprintf("This will be written to the global configuration: %s", dataPath))

149 Render(fmt.Sprintf("This will be written to the global configuration: %s", dataPath))

151

150