3 files changed, 93 insertions, 58 deletions
diff --git a/tests/test-ai-term--f9-in-term.el b/tests/test-ai-term--f9-in-term.el
deleted file mode 100644
index 0477f2517..000000000
--- a/tests/test-ai-term--f9-in-term.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; test-ai-term--f9-in-term.el --- F9 reaches Emacs from inside an agent buffer -*- lexical-binding: t; -*-
-
-;;; Commentary:
-;; ghostel's semi-char mode forwards keys not in `ghostel-keymap-exceptions' to
-;; the terminal program, so a plain <f9> typed while point is in an agent
-;; buffer would be sent to the program instead of toggling the agent -- exactly
-;; the case when the agent buffer fills the frame.  `ai-term.el' re-binds the F9
-;; family in `ghostel-mode-map'.  These tests require ghostel (which defines
-;; `ghostel-mode-map' and lets ai-term's `with-eval-after-load' fire) BEFORE
-;; ai-term, then confirm the bindings landed (and the global ones are intact).
-;; `(require 'ghostel)' does not load the native module, so this stays light.
-
-;;; Code:
-
-(require 'ert)
-(require 'package)
-
-(setq package-user-dir (expand-file-name "elpa" user-emacs-directory))
-(package-initialize)
-(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
-(require 'ghostel)
-(require 'ai-term)
-
-(ert-deftest test-ai-term-f9-bound-in-ghostel-mode-map ()
-  "Normal: <f9> in `ghostel-mode-map' runs the agent toggle."
-  (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-/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 "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; `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 "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>" "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>")
-                  'ghostel--send-event)))
-
-(provide 'test-ai-term--f9-in-term)
-;;; test-ai-term--f9-in-term.el ends here
diff --git a/tests/test-ai-term--keybindings.el b/tests/test-ai-term--keybindings.el
new file mode 100644
index 000000000..a8b92ffa8
--- /dev/null
+++ b/tests/test-ai-term--keybindings.el
@@ -0,0 +1,59 @@
+;;; test-ai-term--keybindings.el --- ai-term keybinding placement -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; ai-term lives under the C-; a prefix (vacated when gptel was archived), with
+;; the frequent "swap to the next agent" also on M-SPC for a fast chord.  M-SPC
+;; must reach Emacs from inside an agent buffer, so it is bound in
+;; `ghostel-mode-map' and added to `ghostel-keymap-exceptions' (the semi-char
+;; map otherwise forwards it to the pty).  C-; is already an exception via
+;; term-config, so the C-; a family resolves through the global prefix.  These
+;; tests require ghostel (so ai-term's `with-eval-after-load' fires) before
+;; ai-term, then confirm the bindings landed and the old F9 family is gone.
+;; `(require 'ghostel)' does not load the native module, so this stays light.
+
+;;; Code:
+
+(require 'ert)
+(require 'package)
+
+(setq package-user-dir (expand-file-name "elpa" user-emacs-directory))
+(package-initialize)
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'ghostel)
+(require 'ai-term)
+
+(ert-deftest test-ai-term-keymap-leaf-bindings ()
+  "Normal: the ai-term keymap binds toggle/select/next/kill on a/s/n/k."
+  (should (eq (keymap-lookup cj/ai-term-keymap "a") #'cj/ai-term))
+  (should (eq (keymap-lookup cj/ai-term-keymap "s") #'cj/ai-term-pick-project))
+  (should (eq (keymap-lookup cj/ai-term-keymap "n") #'cj/ai-term-next))
+  (should (eq (keymap-lookup cj/ai-term-keymap "k") #'cj/ai-term-close)))
+
+(ert-deftest test-ai-term-keymap-registered-under-custom-prefix ()
+  "Normal: the ai-term keymap is registered under C-; a."
+  (should (eq (keymap-lookup cj/custom-keymap "a") cj/ai-term-keymap)))
+
+(ert-deftest test-ai-term-next-bound-to-meta-space-globally ()
+  "Normal: M-SPC runs `cj/ai-term-next' (the fast swap chord)."
+  (should (eq (lookup-key (current-global-map) (kbd "M-SPC")) #'cj/ai-term-next)))
+
+(ert-deftest test-ai-term-meta-space-bound-in-ghostel-mode-map ()
+  "Normal: M-SPC is bound in `ghostel-mode-map' so swap works inside an agent."
+  (should (eq (keymap-lookup ghostel-mode-map "M-SPC") #'cj/ai-term-next)))
+
+(ert-deftest test-ai-term-meta-space-in-keymap-exceptions ()
+  "Regression: M-SPC is in `ghostel-keymap-exceptions' so semi-char mode lets it
+reach Emacs instead of forwarding it to the pty."
+  (should (member "M-SPC" ghostel-keymap-exceptions))
+  (should-not (eq (keymap-lookup ghostel-semi-char-mode-map "M-SPC")
+                  'ghostel--send-event)))
+
+(ert-deftest test-ai-term-f9-family-removed-globally ()
+  "Regression: the old F9 family no longer binds the ai-term commands globally."
+  (should-not (eq (lookup-key (current-global-map) (kbd "<f9>")) #'cj/ai-term))
+  (should-not (eq (lookup-key (current-global-map) (kbd "C-<f9>")) #'cj/ai-term-pick-project))
+  (should-not (eq (lookup-key (current-global-map) (kbd "s-<f9>")) #'cj/ai-term-next))
+  (should-not (eq (lookup-key (current-global-map) (kbd "M-<f9>")) #'cj/ai-term-close)))
+
+(provide 'test-ai-term--keybindings)
+;;; test-ai-term--keybindings.el ends here
diff --git a/tests/test-ai-term--next-no-agents.el b/tests/test-ai-term--next-no-agents.el
new file mode 100644
index 000000000..ef87d71ee
--- /dev/null
+++ b/tests/test-ai-term--next-no-agents.el
@@ -0,0 +1,34 @@
+;;; test-ai-term--next-no-agents.el --- cj/ai-term-next no-agents fallback -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; When no agent buffers are open, `cj/ai-term-next' (bound to M-SPC) launches
+;; the project picker (`cj/ai-term-pick-project') to start the first agent,
+;; instead of signalling a `user-error'.  The swap key thus doubles as a
+;; "start an agent" key when there is nothing to swap to.
+
+;;; Code:
+
+(require 'ert)
+(require 'cl-lib)
+
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'ai-term)
+
+(ert-deftest test-ai-term-next-no-agents-launches-picker ()
+  "Error: no agents open -> launches the picker instead of erroring."
+  (let ((picked 0))
+    (cl-letf (((symbol-function 'cj/--ai-term-agent-buffers) (lambda (&rest _) nil))
+              ((symbol-function 'cj/--ai-term-displayed-agent-window) (lambda (&rest _) nil))
+              ((symbol-function 'cj/ai-term-pick-project) (lambda (&rest _) (setq picked (1+ picked)))))
+      (cj/ai-term-next)
+      (should (= picked 1)))))
+
+(ert-deftest test-ai-term-next-no-agents-does-not-signal ()
+  "Error: no agents open -> returns normally, no user-error raised."
+  (cl-letf (((symbol-function 'cj/--ai-term-agent-buffers) (lambda (&rest _) nil))
+            ((symbol-function 'cj/--ai-term-displayed-agent-window) (lambda (&rest _) nil))
+            ((symbol-function 'cj/ai-term-pick-project) (lambda (&rest _) nil)))
+    (should (progn (cj/ai-term-next) t))))
+
+(provide 'test-ai-term--next-no-agents)
+;;; test-ai-term--next-no-agents.el ends here