fix(ai-config): Ensure gptel-magit is installed via use-package

Replace raw autoload calls with a `use-package` declaration so
`use-package-always-ensure` installs gptel-magit on machines that
haven't run `package-install`, fixing the "Cannot open load file"
error on transient setup.

2 files changed, 32 insertions, 16 deletions

diff --git a/modules/ai-config.el b/modules/ai-config.el
index 92992aa7e..4a3d6a82b 100644
--- a/modules/ai-config.el
+++ b/modules/ai-config.el
@@ -426,27 +426,27 @@ Works for any buffer, whether it's visiting a file or not."
 
 ;;; -------------------------------- GPTel-Magit --------------------------------
 
-;; Lazy gptel-magit integration (replaces use-package gptel-magit block).
+;; `:init' wires the bindings as soon as magit loads, so M-g and the transient
+;; suffixes are ready before any keystroke.  `:commands' + `:defer t' delays
+;; loading gptel-magit itself until one of the entry points is invoked.
 ;;
-;; The original `(magit-mode . gptel-magit-install)' hook ran on every magit
-;; buffer, repeatedly re-installing keybindings and loading gptel eagerly.
-;;
-;; Instead, we register autoloads and wire up keybindings once when magit
-;; loads.  gptel-magit (and gptel) are only loaded when you actually press
-;; one of these keys:
+;; Keys:
 ;;   M-g  — generate commit message (in commit message buffer)
 ;;   g    — generate commit (in magit-commit transient)
 ;;   x    — explain diff (in magit-diff transient)
 
-(with-eval-after-load 'magit
-  (autoload 'gptel-magit-generate-message "gptel-magit" nil t)
-  (autoload 'gptel-magit-commit-generate "gptel-magit" nil t)
-  (autoload 'gptel-magit-diff-explain "gptel-magit" nil t)
-  (define-key git-commit-mode-map (kbd "M-g") #'gptel-magit-generate-message)
-  (transient-append-suffix 'magit-commit #'magit-commit-create
-    '("g" "Generate commit" gptel-magit-commit-generate))
-  (transient-append-suffix 'magit-diff #'magit-stash-show
-    '("x" "Explain" gptel-magit-diff-explain)))
+(use-package gptel-magit
+  :defer t
+  :commands (gptel-magit-generate-message
+             gptel-magit-commit-generate
+             gptel-magit-diff-explain)
+  :init
+  (with-eval-after-load 'magit
+    (define-key git-commit-mode-map (kbd "M-g") #'gptel-magit-generate-message)
+    (transient-append-suffix 'magit-commit #'magit-commit-create
+      '("g" "Generate commit" gptel-magit-commit-generate))
+    (transient-append-suffix 'magit-diff #'magit-stash-show
+      '("x" "Explain" gptel-magit-diff-explain))))
 
 ;; ------------------------------ GPTel Directives -----------------------------
 
diff --git a/tests/test-ai-config-gptel-magit-lazy-loading.el b/tests/test-ai-config-gptel-magit-lazy-loading.el
index 05e3634d4..bc345ef02 100644
--- a/tests/test-ai-config-gptel-magit-lazy-loading.el
+++ b/tests/test-ai-config-gptel-magit-lazy-loading.el
@@ -123,5 +123,21 @@ a gptel-magit function is called."
 One for magit-commit (generate) and one for magit-diff (explain)."
   (should (= 2 (length test-gptel-magit--transient-calls))))
 
+;;; Error Cases — Install behavior
+
+(ert-deftest test-ai-config-gptel-magit-declared-via-use-package ()
+  "ai-config should declare gptel-magit via `use-package' so it gets installed.
+Raw `(autoload ...)' calls register the function name but leave the
+package uninstalled on machines that never ran `package-install'.  The
+\\=`use-package' form inherits `use-package-always-ensure' from
+early-init, which is how every other package in this config gets
+onto `load-path' before its autoloads fire."
+  (let ((source-file (expand-file-name "modules/ai-config.el"
+                                       user-emacs-directory)))
+    (with-temp-buffer
+      (insert-file-contents source-file)
+      (goto-char (point-min))
+      (should (re-search-forward "(use-package gptel-magit\\b" nil t)))))
+
 (provide 'test-ai-config-gptel-magit-lazy-loading)
 ;;; test-ai-config-gptel-magit-lazy-loading.el ends here