From e9e50c7dea0186efe45e86a194fa8327e9c8d441 Mon Sep 17 00:00:00 2001
From: VERSE <sunnyone0901@gmail.com>
Date: Fri, 31 Jul 2026 15:12:49 +0700
Subject: [PATCH] fix(history): respect zdotdir config (#83)

closes #82

Also added a `HISTFILE` so it always reads the correct file that the
shell is pointing to

Is there a `HISTFILE`? If so, use it
If it's Zsh: Is there a `ZDOTDIR`? Use `ZDOTDIR/.zsh_history`
If it's Fish: Is there an `XDG_DATA_HOME`? Use
`XDG_DATA_HOME/fish/fish_history`
If none of them are present, revert to the default `$HOME/...`
---
 integration/history.go       | 18 +++++++++++-------
 integration/shell/adapter.go |  8 ++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/integration/history.go b/integration/history.go
index 6f82965..9b23230 100644
--- a/integration/history.go
+++ b/integration/history.go
@@ -66,13 +66,17 @@ func SearchHistory(query string, aliases map[string]string) ([]HistResult, error
 	}
 
 	var histFile string
-	switch shellName {
-	case "zsh":
-		histFile = filepath.Join(home, ".zsh_history")
-	case "fish":
-		histFile = filepath.Join(home, ".local", "share", "fish", "fish_history")
-	default:
-		histFile = filepath.Join(home, ".bash_history")
+	if envHist := os.Getenv("HISTFILE"); envHist != "" {
+		histFile = envHist
+	} else {
+		switch shellName {
+		case "zsh":
+			histFile = filepath.Join(shell.GetZshConfigDir(), ".zsh_history")
+		case "fish":
+			histFile = filepath.Join(shell.GetFishDataDir(), "fish_history")
+		default:
+			histFile = filepath.Join(home, ".bash_history")
+		}
 	}
 
 	if info, err := os.Stat(histFile); err == nil {
diff --git a/integration/shell/adapter.go b/integration/shell/adapter.go
index 01472ee..3da10be 100644
--- a/integration/shell/adapter.go
+++ b/integration/shell/adapter.go
@@ -125,6 +125,14 @@ func GetFishConfigDir() string {
 	return filepath.Join(home, ".config", "fish")
 }
 
+func GetFishDataDir() string {
+	if xdg := os.Getenv("XDG_DATA_HOME"); xdg != "" {
+		return filepath.Join(xdg, "fish")
+	}
+	home, _ := os.UserHomeDir()
+	return filepath.Join(home, ".local", "share", "fish")
+}
+
 func ScanPosixAliases(files []string) map[string]string {
 	aliases := make(map[string]string)
 	home, err := os.UserHomeDir()