Files
iris-context/integration/history.go
T
VERSE 37182f7212 fix(history): substring fuzzy search (#74)
closes #73

<img width="1434" height="302" alt="image"
src="https://github.com/user-attachments/assets/87bb8431-40c7-4ee8-ad58-79c4fea6efa7"
/>

I used use prefix match
imagine you have a long command ENOUGH that you used to use (like
image), with fuzzy search + substring, it will always show suggestion
about that command in the list but in the bottom
and I see this very annoying

but now I limit the score from fuzzy search, if the command is too long
(which means fuzzy score is extremely weak), skip it right away

<img width="1296" height="437" alt="image"
src="https://github.com/user-attachments/assets/77d807a2-ddce-4c37-9f5b-a02cd44de325"
/>

it now has substring support
2026-07-30 21:11:34 +07:00

323 lines
6.8 KiB
Go

package integration
import (
"bufio"
"os"
"path/filepath"
"sort"
"strings"
"sync"
"github.com/versenilvis/fuzzy"
"github.com/versenilvis/iris/integration/shell"
)
var (
sessionHistory []string
sessionHistoryMu sync.Mutex
historyCache []string
idMapCache map[string]int
searcherCache *fuzzy.Searcher
mu sync.Mutex
lastModTime int64
)
func RecordSessionCommand(cmd string) {
cmd = strings.TrimSpace(cmd)
if cmd == "" {
return
}
mu.Lock()
defer mu.Unlock()
sessionHistoryMu.Lock()
defer sessionHistoryMu.Unlock()
if len(sessionHistory) > 0 && sessionHistory[len(sessionHistory)-1] == cmd {
return
}
sessionHistory = append(sessionHistory, cmd)
historyCache = nil // invalidate to merge session history on next search
}
type HistResult struct {
ID int
Cmd string
FuzzyScore int
}
func init() {
idMapCache = make(map[string]int)
}
func SearchHistory(query string, aliases map[string]string) ([]HistResult, error) {
mu.Lock()
defer mu.Unlock()
home, err := os.UserHomeDir()
if err != nil {
return nil, err
}
shellName := "bash"
if shell.Current != nil {
shellName = shell.Current.GetName()
}
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 info, err := os.Stat(histFile); err == nil {
if info.ModTime().UnixNano() > lastModTime {
historyCache = nil // force reload
idMapCache = make(map[string]int)
lastModTime = info.ModTime().UnixNano()
}
}
// lazy load history if cache is empty
if len(historyCache) == 0 {
file, err := os.Open(histFile)
if err != nil && !os.IsNotExist(err) {
return nil, err
}
if file != nil {
defer func() { _ = file.Close() }()
}
var allCmds []string
if file != nil {
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
cmd := line
if shellName == "zsh" {
parts := strings.SplitN(line, ";", 2)
if len(parts) == 2 {
cmd = parts[1]
}
} else if shellName == "bash" {
if strings.HasPrefix(line, "#") && len(line) > 1 {
isTimestamp := true
for _, c := range line[1:] {
if c < '0' || c > '9' {
isTimestamp = false
break
}
}
if isTimestamp {
continue
}
}
} else if shellName == "fish" {
if after, ok := strings.CutPrefix(line, "- cmd: "); ok {
cmd = after
} else {
continue
}
}
cmd = strings.TrimSpace(cmd)
if cmd != "" {
allCmds = append(allCmds, cmd)
}
}
if err := scanner.Err(); err != nil {
return nil, err
}
}
// build historyCache backwards so newest commands come first
seen := make(map[string]bool)
historyCache = nil
idMapCache = make(map[string]int)
currentID := len(sessionHistory) + len(allCmds)
sessionHistoryMu.Lock()
for i := len(sessionHistory) - 1; i >= 0; i-- {
cmd := sessionHistory[i]
if !seen[cmd] {
historyCache = append(historyCache, cmd)
seen[cmd] = true
idMapCache[cmd] = currentID
currentID--
}
}
sessionHistoryMu.Unlock()
for i := len(allCmds) - 1; i >= 0; i-- {
cmd := allCmds[i]
if !seen[cmd] {
historyCache = append(historyCache, cmd)
seen[cmd] = true
idMapCache[cmd] = currentID
currentID--
}
}
searcherCache = fuzzy.NewPlainSearcher(historyCache)
}
if query == "" {
var results []HistResult
limit := min(len(historyCache), 100)
for i := range limit {
cmd := historyCache[i]
results = append(results, HistResult{
ID: idMapCache[cmd],
Cmd: cmd,
})
}
return results, nil
}
var alternativeQueries []string
for name, target := range aliases {
if target != "" {
qLow := strings.ToLower(query)
tLow := strings.ToLower(target)
nLow := strings.ToLower(name)
if qLow == tLow {
alternativeQueries = append(alternativeQueries, name)
} else if strings.HasPrefix(qLow, tLow+" ") {
suffix := query[len(target):]
alternativeQueries = append(alternativeQueries, name+suffix)
}
if qLow == nLow {
alternativeQueries = append(alternativeQueries, target)
} else if strings.HasPrefix(qLow, nLow+" ") {
suffix := query[len(name):]
alternativeQueries = append(alternativeQueries, target+suffix)
}
}
}
var results []HistResult
seenCmds := make(map[string]bool)
addMatches := func(q string) {
qLow := strings.ToLower(q)
// extract pure substring matches (all words present) based strictly on recency order (historyCache is newest-first)
// this ensures that long commands with exact substrings are never truncated by the fuzzy searcher's limit
strictMatches := 0
words := strings.Fields(qLow)
if len(words) == 0 {
words = []string{qLow}
}
for _, cmd := range historyCache {
if seenCmds[cmd] {
continue
}
cmdLow := strings.ToLower(cmd)
matchAll := true
for _, w := range words {
if !strings.Contains(cmdLow, w) {
matchAll = false
break
}
}
if !matchAll {
continue
}
seenCmds[cmd] = true
results = append(results, HistResult{
ID: idMapCache[cmd],
Cmd: cmd,
FuzzyScore: 10000,
})
strictMatches++
if strictMatches >= 200 {
break
}
}
matches := searcherCache.SearchWithScores(q, &fuzzy.SearchOptions{Limit: 1000})
for _, m := range matches {
if seenCmds[m.Str] {
continue
}
// filter out extremely weak fuzzy matches (e.g. random garbage typing that
// loosely matches across a very long command)
if len(q) > 0 && m.Score/len(q) < 150 {
continue
}
seenCmds[m.Str] = true
results = append(results, HistResult{
ID: idMapCache[m.Str],
Cmd: m.Str,
FuzzyScore: m.Score,
})
}
}
addMatches(query)
for _, altQ := range alternativeQueries {
addMatches(altQ)
}
getTier := func(cmd, q string) int {
bestTier := 4
check := func(ql string) {
cmdLow := strings.ToLower(cmd)
qlLow := strings.ToLower(ql)
tier := 4
if cmdLow == qlLow {
tier = 1
} else if strings.HasPrefix(cmdLow, qlLow) {
tier = 2
} else if strings.Contains(cmdLow, qlLow) {
tier = 3
}
if tier < bestTier {
bestTier = tier
}
}
check(q)
for _, altQ := range alternativeQueries {
check(altQ)
}
return bestTier
}
tiers := make([]int, len(results))
for i, r := range results {
tiers[i] = getTier(r.Cmd, query)
}
sort.SliceStable(results, func(i, j int) bool {
tI := tiers[i]
tJ := tiers[j]
if tI != tJ {
return tI < tJ
}
if tI == 4 && results[i].FuzzyScore != results[j].FuzzyScore {
return results[i].FuzzyScore > results[j].FuzzyScore
}
return results[i].ID > results[j].ID
})
return results, nil
}