guard: add fuzzy fallback for versioned group process names

Author: lovitus

internal/guard/match.go

@@ -40,6 +40,15 @@ func matcherMatches(m config.Matcher, p Proc) bool {
 			return true
 		}
 	}
+	for _, s := range m.NameContains {
+		needle := normalizeProcName(s)
+		if needle == "" {
+			continue
+		}
+		if fuzzyNameContainsMatch(p.NameNorm, needle) {
+			return true
+		}
+	}
 	for _, s := range m.ExeContains {
 		needle := strings.ToLower(strings.TrimSpace(s))
 		if needle == "" {
@@ -57,6 +66,93 @@ func shouldUseExactNameMatch(needle string) bool {
 	return len(needle) <= 5 && !strings.Contains(needle, " ")
 }
 
+func fuzzyNameContainsMatch(nameNorm string, needle string) bool {
+	if nameNorm == needle {
+		return true
+	}
+
+	if trimmed := trimVersionLikeSuffix(nameNorm); trimmed != "" && trimmed != nameNorm {
+		if trimmed == needle {
+			return true
+		}
+		if !shouldUseExactNameMatch(needle) && strings.Contains(trimmed, needle) {
+			return true
+		}
+	}
+
+	if shouldUseExactNameMatch(needle) {
+		return hasDelimitedAffix(nameNorm, needle)
+	}
+	return false
+}
+
+func hasDelimitedAffix(nameNorm string, needle string) bool {
+	if len(nameNorm) <= len(needle) {
+		return false
+	}
+	if strings.HasPrefix(nameNorm, needle) && isNameDelimiter(rune(nameNorm[len(needle)])) {
+		return true
+	}
+	if strings.HasSuffix(nameNorm, needle) && isNameDelimiter(rune(nameNorm[len(nameNorm)-len(needle)-1])) {
+		return true
+	}
+	return false
+}
+
+func trimVersionLikeSuffix(nameNorm string) string {
+	trimmed := strings.TrimSpace(nameNorm)
+	for {
+		base, suffix, ok := splitTrailingSegment(trimmed)
+		if !ok || !looksVersionLikeSegment(suffix) {
+			return trimmed
+		}
+		trimmed = strings.TrimSpace(base)
+	}
+}
+
+func splitTrailingSegment(s string) (string, string, bool) {
+	if s == "" {
+		return "", "", false
+	}
+	for i := len(s) - 1; i >= 0; i-- {
+		if isNameDelimiter(rune(s[i])) {
+			if i == len(s)-1 {
+				return "", "", false
+			}
+			return s[:i], s[i+1:], true
+		}
+	}
+	return "", "", false
+}
+
+func looksVersionLikeSegment(seg string) bool {
+	seg = strings.TrimSpace(seg)
+	if seg == "" {
+		return false
+	}
+	hasDigit := false
+	for _, r := range seg {
+		if r >= '0' && r <= '9' {
+			hasDigit = true
+			continue
+		}
+		if (r >= 'a' && r <= 'z') || r == '.' {
+			continue
+		}
+		return false
+	}
+	return hasDigit
+}
+
+func isNameDelimiter(r rune) bool {
+	switch r {
+	case ' ', '-', '_', '.', '(', ')', '[', ']', '{', '}':
+		return true
+	default:
+		return false
+	}
+}
+
 func groupRootMatch(g config.GroupSpec, p Proc) bool {
 	for _, m := range g.RootMatchers {
 		if matcherMatches(m, p) {

internal/guard/match_test.go

@@ -0,0 +1,47 @@
+package guard
+
+import (
+	"testing"
+
+	"remem/internal/config"
+)
+
+func TestMatcherMatchesExactBeforeFuzzy(t *testing.T) {
+	m := config.Matcher{NameContains: []string{"codex"}}
+	p := Proc{NameNorm: "codex"}
+	if !matcherMatches(m, p) {
+		t.Fatalf("expected exact match to succeed")
+	}
+}
+
+func TestMatcherMatchesFuzzyVersionSuffixForShortName(t *testing.T) {
+	m := config.Matcher{NameContains: []string{"codex"}}
+	p := Proc{NameNorm: "codex-1.2.3"}
+	if !matcherMatches(m, p) {
+		t.Fatalf("expected fuzzy suffix match to succeed")
+	}
+}
+
+func TestMatcherMatchesFuzzyVersionSuffixForLongName(t *testing.T) {
+	m := config.Matcher{NameContains: []string{"firefox"}}
+	p := Proc{NameNorm: "firefox-135.0.1"}
+	if !matcherMatches(m, p) {
+		t.Fatalf("expected long-name fuzzy suffix match to succeed")
+	}
+}
+
+func TestMatcherMatchesDoesNotUseMidStringContainsForShortName(t *testing.T) {
+	m := config.Matcher{NameContains: []string{"code"}}
+	p := Proc{NameNorm: "xcode-helper"}
+	if matcherMatches(m, p) {
+		t.Fatalf("expected short-name fallback to avoid mid-string false positive")
+	}
+}
+
+func TestMatcherMatchesShortNameAllowsDelimitedSuffix(t *testing.T) {
+	m := config.Matcher{NameContains: []string{"code"}}
+	p := Proc{NameNorm: "code-insiders"}
+	if !matcherMatches(m, p) {
+		t.Fatalf("expected short-name delimited suffix match to succeed")
+	}
+}