From af88e12eccdea7715db2088e2ff51f6f82e70781 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 20 Jun 2026 22:04:24 -0400
Subject: feat(ai-term): add s-F9 step-to-next-agent, drop C-S-F9 close alias

s-F9 (cj/ai-term-next) steps through the open agent buffers in name order. It's the "switch among existing agents" surface F9's toggle never provided. The cycle logic lives in a pure helper (cj/--ai-term-next-agent-buffer) with Normal/Boundary/Error coverage. The command is a thin window-mutating wrapper.

I dropped the C-S-F9 close alias, leaving M-F9 as the sole close binding. I moved cj/server-shutdown off C-<f10> to C-x C so the key keeps forwarding to the terminal program inside an agent buffer. I also removed the now-unused F10 entries from term-config's ghostel exceptions.
---
 tests/test-ai-term--f9-in-term.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'tests/test-ai-term--f9-in-term.el')

diff --git a/tests/test-ai-term--f9-in-term.el b/tests/test-ai-term--f9-in-term.el
index dad11ffc..0477f251 100644
--- a/tests/test-ai-term--f9-in-term.el
+++ b/tests/test-ai-term--f9-in-term.el
@@ -26,27 +26,29 @@
   (should (eq (keymap-lookup ghostel-mode-map "<f9>") #'cj/ai-term)))
 
 (ert-deftest test-ai-term-f9-family-bound-in-ghostel-mode-map ()
-  "Normal: the C-/M-/C-S- F9 variants are bound in `ghostel-mode-map' too.
-`M-<f9>' and `C-S-<f9>' both close an agent via `cj/ai-term-close'."
+  "Normal: the C-/s-/M- F9 variants are bound in `ghostel-mode-map' too.
+`s-<f9>' steps to the next agent; `M-<f9>' closes an agent via
+`cj/ai-term-close'."
   (should (eq (keymap-lookup ghostel-mode-map "C-<f9>") #'cj/ai-term-pick-project))
-  (should (eq (keymap-lookup ghostel-mode-map "M-<f9>") #'cj/ai-term-close))
-  (should (eq (keymap-lookup ghostel-mode-map "C-S-<f9>") #'cj/ai-term-close)))
+  (should (eq (keymap-lookup ghostel-mode-map "s-<f9>") #'cj/ai-term-next))
+  (should (eq (keymap-lookup ghostel-mode-map "M-<f9>") #'cj/ai-term-close)))
 
 (ert-deftest test-ai-term-f9-still-bound-globally ()
   "Normal: the global F9 family bindings are intact.
 `<f9>' toggles the ai-term agent window; `C-<f9>' picks a project
-agent; `M-<f9>' and `C-S-<f9>' close an agent via `cj/ai-term-close'."
+agent; `s-<f9>' steps to the next agent; `M-<f9>' closes an agent
+via `cj/ai-term-close'."
   (should (eq (lookup-key (current-global-map) (kbd "<f9>")) #'cj/ai-term))
   (should (eq (lookup-key (current-global-map) (kbd "C-<f9>")) #'cj/ai-term-pick-project))
-  (should (eq (lookup-key (current-global-map) (kbd "M-<f9>")) #'cj/ai-term-close))
-  (should (eq (lookup-key (current-global-map) (kbd "C-S-<f9>")) #'cj/ai-term-close)))
+  (should (eq (lookup-key (current-global-map) (kbd "s-<f9>")) #'cj/ai-term-next))
+  (should (eq (lookup-key (current-global-map) (kbd "M-<f9>")) #'cj/ai-term-close)))
 
 (ert-deftest test-ai-term-f9-family-in-keymap-exceptions ()
   "Regression: the F9 family is in `ghostel-keymap-exceptions' so semi-char
 mode lets it reach Emacs instead of forwarding it to the terminal program.
 Binding in `ghostel-mode-map' alone is not enough -- the semi-char map outranks
 it and forwards any key not in the exceptions to the pty."
-  (dolist (key '("<f9>" "C-<f9>" "M-<f9>" "C-S-<f9>"))
+  (dolist (key '("<f9>" "C-<f9>" "s-<f9>" "M-<f9>"))
     (should (member key ghostel-keymap-exceptions)))
   ;; The rebuilt semi-char map must no longer forward <f9> to the pty.
   (should-not (eq (keymap-lookup ghostel-semi-char-mode-map "<f9>")
-- 
cgit v1.2.3