fix: remove legacy prompt suffix advice on reload

Author: tninja

ai-code-grill.el

@@ -88,6 +88,12 @@ acting."
 (add-hook 'ai-code-prompt-suffix-functions
           #'ai-code--grill-me-suffix-provider 20)
 
+;; Remove the prompt-transform advice installed by pre-provider releases.
+(when (advice-member-p 'ai-code--with-optional-grill-me
+                       'ai-code--insert-prompt)
+  (advice-remove 'ai-code--insert-prompt
+                 'ai-code--with-optional-grill-me))
+
 (defun ai-code--install-grill-me-command-advice ()
   "Install origin-preserving advice on available Grill commands."
   (dolist (command ai-code--grill-me-commands)

ai-code-harness.el

@@ -456,6 +456,12 @@ Send-time routing uses this result for test and discussion follow-up suffixes."
 (add-hook 'ai-code-prompt-suffix-functions
           #'ai-code--discussion-follow-up-suffix-provider 40)
 
+;; Remove the send-time advice installed by pre-provider releases.
+(when (advice-member-p 'ai-code--with-auto-test-suffix-for-send
+                       'ai-code--write-prompt-to-file-and-send)
+  (advice-remove 'ai-code--write-prompt-to-file-and-send
+                 'ai-code--with-auto-test-suffix-for-send))
+
 (defun ai-code--test-after-code-change--set (symbol value)
   "Set SYMBOL to VALUE and update related suffix behavior."
   (set-default symbol value)

test/test_ai-code-grill.el

@@ -54,6 +54,29 @@
     (should (equal exit-code 0))
     (should-not (string-match-p "Error:" output))))
 
+(ert-deftest ai-code-grill-reload-removes-legacy-prompt-advice ()
+  "Reloading Grill should remove its legacy prompt-transform advice."
+  (let ((was-fboundp (fboundp 'ai-code--with-optional-grill-me))
+        (original-function
+         (when (fboundp 'ai-code--with-optional-grill-me)
+           (symbol-function 'ai-code--with-optional-grill-me))))
+    (unwind-protect
+        (progn
+          (fset 'ai-code--with-optional-grill-me
+                (lambda (orig-fun prompt-text)
+                  (funcall orig-fun prompt-text)))
+          (advice-add 'ai-code--insert-prompt
+                      :around #'ai-code--with-optional-grill-me)
+          (load (locate-library "ai-code-grill") nil nil t)
+          (should-not
+           (advice-member-p #'ai-code--with-optional-grill-me
+                            'ai-code--insert-prompt)))
+      (advice-remove 'ai-code--insert-prompt
+                     #'ai-code--with-optional-grill-me)
+      (if was-fboundp
+          (fset 'ai-code--with-optional-grill-me original-function)
+        (fmakunbound 'ai-code--with-optional-grill-me)))))
+
 (ert-deftest ai-code-grill-disabled-keeps-prompt ()
   (let ((ai-code-grill-me-enabled nil)
         (context (ai-code-grill-test--context 'ai-code-code-change)))

test/test_ai-code-harness.el

@@ -588,6 +588,29 @@
       (should (equal (ai-code--apply-prompt-suffixes "Prompt")
                      "Prompt\nCUSTOM\nGRILL\nAUTO\nFOLLOW")))))
 
+(ert-deftest ai-code-test-harness-reload-removes-legacy-send-advice ()
+  "Reloading the harness should remove its legacy send-time advice."
+  (let ((was-fboundp (fboundp 'ai-code--with-auto-test-suffix-for-send))
+        (original-function
+         (when (fboundp 'ai-code--with-auto-test-suffix-for-send)
+           (symbol-function 'ai-code--with-auto-test-suffix-for-send))))
+    (unwind-protect
+        (progn
+          (fset 'ai-code--with-auto-test-suffix-for-send
+                (lambda (orig-fun prompt-text)
+                  (funcall orig-fun prompt-text)))
+          (advice-add 'ai-code--write-prompt-to-file-and-send
+                      :around #'ai-code--with-auto-test-suffix-for-send)
+          (load (locate-library "ai-code-harness") nil nil t)
+          (should-not
+           (advice-member-p #'ai-code--with-auto-test-suffix-for-send
+                            'ai-code--write-prompt-to-file-and-send)))
+      (advice-remove 'ai-code--write-prompt-to-file-and-send
+                     #'ai-code--with-auto-test-suffix-for-send)
+      (if was-fboundp
+          (fset 'ai-code--with-auto-test-suffix-for-send original-function)
+        (fmakunbound 'ai-code--with-auto-test-suffix-for-send)))))
+
 (ert-deftest ai-code-test-use-prompt-suffix-does-not-disable-grill ()
   "The legacy suffix switch should not become a Grill master switch."
   (let ((ai-code-use-prompt-suffix nil)