Fix h7 agent hotkey normalization

2 files changed, 125 insertions, 1 deletions

diff --git a/internal/ui/table.go b/internal/ui/table.go
index 398aeeb..b1008fd 100644
--- a/internal/ui/table.go
+++ b/internal/ui/table.go
@@ -1366,7 +1366,7 @@ func (m *Model) SetUltra(u bool) {
 // ultra mode. If it does, the current hotkey is left unchanged and an error is
 // returned so callers can surface the conflict.
 func (m *Model) SetAgentFilterHotkey(key string) error {
-	key = strings.TrimSpace(key)
+	key = normalizeAgentFilterHotkey(key)
 	if key == "" {
 		return nil
 	}
@@ -1395,6 +1395,40 @@ func validateAgentFilterHotkey(key string) error {
 	return nil
 }
 
+func normalizeAgentFilterHotkey(key string) string {
+	key = strings.TrimSpace(key)
+	if key == "" || len(key) == 1 {
+		return key
+	}
+	switch strings.ToLower(key) {
+	case "down":
+		return "down"
+	case "end":
+		return "end"
+	case "enter":
+		return "enter"
+	case "esc", "escape":
+		return "esc"
+	case "home":
+		return "home"
+	case "left":
+		return "left"
+	case "pgdn", "pgdown":
+		return "pgdn"
+	case "pgup":
+		return "pgup"
+	case "right":
+		return "right"
+	case "space":
+		return "space"
+	case "tab":
+		return "tab"
+	case "up":
+		return "up"
+	}
+	return key
+}
+
 var reservedAgentHotkeys = map[string]struct{}{
 	"+":      {},
 	"0":      {},
diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go
index 9d0766e..2ea9776 100644
--- a/internal/ui/table_test.go
+++ b/internal/ui/table_test.go
@@ -937,6 +937,96 @@ func TestAgentFilterHotkeyCanBeRebound(t *testing.T) {
 	}
 }
 
+func TestAgentFilterHotkeyNamedKeysAreCanonicalized(t *testing.T) {
+	tmp := t.TempDir()
+	taskPath := filepath.Join(tmp, "task")
+	logFile := filepath.Join(tmp, "log.txt")
+
+	script := "#!/bin/sh\n" +
+		"printf '%s ' \"$@\" >> " + logFile + "\n" +
+		"printf '\\n' >> " + logFile + "\n" +
+		"if echo \"$@\" | grep -q export; then\n" +
+		"  echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" +
+		"fi\n"
+
+	if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil {
+		t.Fatal(err)
+	}
+
+	origPath := os.Getenv("PATH")
+	os.Setenv("PATH", tmp+":"+origPath)
+	t.Cleanup(func() { os.Setenv("PATH", origPath) })
+
+	os.Setenv("TASKDATA", tmp)
+	os.Setenv("TASKRC", "/dev/null")
+	t.Cleanup(func() {
+		os.Unsetenv("TASKDATA")
+		os.Unsetenv("TASKRC")
+	})
+
+	m, err := New(nil, "firefox")
+	if err != nil {
+		t.Fatalf("New: %v", err)
+	}
+	if err := m.SetAgentFilterHotkey("Tab"); err != nil {
+		t.Fatalf("SetAgentFilterHotkey: %v", err)
+	}
+	if got := m.agentFilterHotkeyLabel(); got != "tab" {
+		t.Fatalf("canonical hotkey label: got %q want %q", got, "tab")
+	}
+
+	mv, _ := (&m).Update(tea.KeyPressMsg{Code: tea.KeyTab, Text: "tab"})
+	m = *mv.(*Model)
+	if !reflect.DeepEqual(m.filters, []string{"+agent"}) {
+		t.Fatalf("tab did not toggle agent filter: %#v", m.filters)
+	}
+
+	data, err := os.ReadFile(logFile)
+	if err != nil {
+		t.Fatalf("read log: %v", err)
+	}
+	if !strings.Contains(string(data), "+agent status:pending export") {
+		t.Fatalf("toggle did not reload with +agent filter: %s", data)
+	}
+}
+
+func TestAgentFilterHotkeyRejectsUppercaseNamedKeyCollision(t *testing.T) {
+	tmp := t.TempDir()
+	taskPath := filepath.Join(tmp, "task")
+
+	script := "#!/bin/sh\n" +
+		"if echo \"$@\" | grep -q export; then\n" +
+		"  echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" +
+		"fi\n"
+
+	if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil {
+		t.Fatal(err)
+	}
+
+	origPath := os.Getenv("PATH")
+	os.Setenv("PATH", tmp+":"+origPath)
+	t.Cleanup(func() { os.Setenv("PATH", origPath) })
+
+	os.Setenv("TASKDATA", tmp)
+	os.Setenv("TASKRC", "/dev/null")
+	t.Cleanup(func() {
+		os.Unsetenv("TASKDATA")
+		os.Unsetenv("TASKRC")
+	})
+
+	m, err := New(nil, "firefox")
+	if err != nil {
+		t.Fatalf("New: %v", err)
+	}
+
+	if err := m.SetAgentFilterHotkey("Enter"); err == nil {
+		t.Fatalf("expected collision for named hotkey Enter")
+	}
+	if got := m.agentFilterHotkeyLabel(); got != "3" {
+		t.Fatalf("colliding named hotkey changed label: got %q want %q", got, "3")
+	}
+}
+
 func TestAgentFilterHotkeyCollisionIsRejected(t *testing.T) {
 	tmp := t.TempDir()
 	taskPath := filepath.Join(tmp, "task")