From fb5663954ca8c692f1bebbfdb2dd139e8a63667f Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Fri, 8 May 2026 19:21:26 -0500 Subject: feat(ai-vterm): F9 toggle/redisplay/pick + persistent split geometry F9 was a single command that always opened the project picker. Three small frustrations stacked up. With one claude buffer open and not visible, F9 was a redundant prompt to pick a project that already had a session. With claude visible, there was no way to bury it without M-x quit-window. With two projects' buffers alive, swapping between them was a buffer-switch chore. F9 is now a dispatch: - Claude visible in this frame: quit the window (toggle off) and capture the geometry first. - Exactly one claude buffer alive but hidden: re-display it (DWIM single-buffer case). - Zero or two-plus alive: fall through to the project picker. C-F9 is the always-pick-project entry point for explicit project switches. M-F9 is a buffer picker over the alive claude buffers. If a claude window is currently shown, the picked buffer replaces it in that window so the split orientation and size carry over. The shown buffer sorts last in the picker with a [shown] marker so RET picks "the other one." Split geometry persists across toggles. Two module-level vars (cj/--ai-vterm-last-direction, cj/--ai-vterm-last-size) capture at toggle-off and feed a custom display action. After M-S-t flips claude from right to bottom, F9 toggle-off-then-on returns it at the bottom. After a mouse resize, the next toggle restores that fraction. State is per-session. Restarts reset to default right/0.5. Two display-buffer fixes came out of testing: - save-window-excursion around (vterm name) keeps the dashboard from being buried on a fresh F9 at startup. vterm calls pop-to-buffer-same-window internally, which would otherwise replace the selected window's buffer before the alist could route the new one. - The action chain swaps display-buffer-use-some-window for a more specific cj/--ai-vterm-reuse-existing-claude. The generic version stole non-claude windows on C-F9 when the user was focused inside claude (claude on bottom, code on top -> new project landed in the code window). The specific version only reuses windows that already show a claude buffer. I reclaimed C-F9 from the gptel toggle in ai-config.el. C-; a t still binds gptel. I added eight new test files (claude-buffers, displayed-claude-window, dispatch, pick-buffer-candidates, window-geometry, capture-state, display-saved, reuse-existing-claude) plus a regression test on cj/--ai-vterm-show-or-create for the dashboard-preservation fix. All 73 ai-vterm tests pass and the full make test suite is green. --- modules/ai-config.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'modules/ai-config.el') diff --git a/modules/ai-config.el b/modules/ai-config.el index 779862bc..3b0b6e20 100644 --- a/modules/ai-config.el +++ b/modules/ai-config.el @@ -5,7 +5,7 @@ ;; Configuration for AI integrations in Emacs, focused on GPTel. ;; ;; Main Features: -;; - Quick toggle for AI assistant window (F9 or C-; a t) +;; - Quick toggle for AI assistant window (C-; a t) ;; - Custom keymap (C-; a prefix) for AI-related commands. ;; - Enhanced org-mode conversation formatting with timestamps ;; allows switching models and easily compare and track responses. @@ -17,7 +17,7 @@ ;; Basic Workflow ;; ;; Using a side-chat window: -;; - Launch GPTel via F9 or C-; a t, and chat in the AI-Assistant side window (C- to send) +;; - Launch GPTel via C-; a t, and chat in the AI-Assistant side window (C- to send) ;; - Change system prompt (expertise, personalities) with C-; a p ;; - Add context from files (C-; a f) or current buffer (C-; a .) ;; - Save conversations with C-; a s, load previous ones with C-; a l @@ -312,9 +312,8 @@ Works for any buffer, whether it's visiting a file or not." :defer t :commands (gptel gptel-send gptel-menu) :bind - (("C-" . cj/toggle-gptel) - :map gptel-mode-map - ("C-" . gptel-send)) + (:map gptel-mode-map + ("C-" . gptel-send)) :custom (gptel-default-mode 'org-mode) (gptel-expert-commands t) -- cgit v1.2.3