Address runtime debug review feedback

Author: tninja

ai-code-mcp-debug-tools.el

@@ -127,12 +127,14 @@
 (defun ai-code-mcp-debug-tools--require-enabled ()
   "Signal an error unless debug inspection tools are enabled."
   (unless (ai-code-mcp-debug-tools--enabled-p)
-    (error "Emacs debug MCP tools are disabled for this session")))
+    (error
+     "Enable ai-code-mcp-debug-tools-enabled to use the global Emacs debug MCP tools")))
 
 (defun ai-code-mcp-debug-tools--require-eval-enabled ()
   "Signal an error unless `eval_elisp' is enabled."
   (unless (ai-code-mcp-debug-tools--eval-enabled-p)
-    (error "The eval_elisp tool is disabled for this session")))
+    (error
+     "Enable ai-code-mcp-debug-tools-enable-eval-elisp to use the global eval_elisp MCP tool")))
 
 (defun ai-code-mcp-debug-tools-setup ()
   "Register optional MCP debugging tools when enabled."

ai-code.el

@@ -480,9 +480,11 @@ ARG is the prefix argument."
                                clipboard-context)))))
         (ai-code--insert-prompt final-prompt)))))
 
-(defun ai-code--emacs-runtime-debug-prompt (description enable-eval-elisp)
+(defun ai-code--emacs-runtime-debug-prompt (description eval-available-p
+                                                        request-eval-elisp)
   "Return an Emacs runtime debugging prompt from DESCRIPTION.
-ENABLE-EVAL-ELISP describes whether `eval_elisp' is available."
+EVAL-AVAILABLE-P reports whether `eval_elisp' is globally enabled.
+REQUEST-EVAL-ELISP reports whether this debug run may use it."
   (format
    (concat
     "Use the Emacs MCP tools available in this session to debug my Emacs runtime.\n"
@@ -493,9 +495,13 @@ ENABLE-EVAL-ELISP describes whether `eval_elisp' is available."
     "Explain what you find, then recommend the smallest fix or next step.\n\n"
     "Runtime issue description:\n"
     "%s")
-   (if enable-eval-elisp
-       "eval_elisp is enabled in your Emacs MCP config."
-     "eval_elisp is disabled in your Emacs MCP config, so rely on non-eval inspection tools unless you first enable ai-code-mcp-debug-tools-enable-eval-elisp.")
+   (cond
+    ((and eval-available-p request-eval-elisp)
+     "eval_elisp is enabled in your Emacs MCP config and is allowed for this debugging run.")
+    (eval-available-p
+     "eval_elisp is enabled in your Emacs MCP config, but it was not requested for this debugging run.")
+    (t
+     "eval_elisp is disabled in your Emacs MCP config, so rely on non-eval inspection tools unless you first enable ai-code-mcp-debug-tools-enable-eval-elisp."))
    description))
 
 ;;;###autoload
@@ -508,20 +514,23 @@ ENABLE-EVAL-ELISP describes whether `eval_elisp' is available."
   (let* ((description
           (ai-code-read-string
            "Describe the Emacs runtime issue (it can be an interactive function or a key binding): "))
-         (enable-eval-elisp
+         (eval-available-p
+          (bound-and-true-p ai-code-mcp-debug-tools-enable-eval-elisp))
+         (request-eval-elisp
           (y-or-n-p
            "Allow AI to eval Emacs Lisp while debugging this Emacs runtime issue? ")))
     (when description
-      (when (and enable-eval-elisp
-                 (not (bound-and-true-p ai-code-mcp-debug-tools-enable-eval-elisp)))
+      (when (and request-eval-elisp
+                 (not eval-available-p))
         (user-error
          "Enable ai-code-mcp-debug-tools-enable-eval-elisp before requesting eval_elisp debugging"))
       (when-let* ((prompt
                    (ai-code-read-string
                     "Confirm and edit Emacs runtime debug prompt: "
                     (ai-code--emacs-runtime-debug-prompt
                      description
-                     enable-eval-elisp))))
+                     eval-available-p
+                     request-eval-elisp))))
         (ai-code--insert-prompt prompt)))))
 
 ;;;###autoload
@@ -683,7 +692,6 @@ Shows the current backend label to the right."
   ("p" "Open prompt history file" ai-code-open-prompt-file)
   ("m" "Debug python MCP server" ai-code-debug-mcp)
   ("N" "Toggle notifications" ai-code-notifications-toggle)
-  ;; DONE: add a menu item: Debug your emacs runtime. It will temporarily enable ai-code-mcp-debug-tools-enabled, and ask user if they want to enable ai-code-mcp-debug-tools-enable-eval-elisp (eval elisp with AI?) to further help debugging. User can describe what happens (We prompt them that it can debug an interactive function or a key-binding). The final prompt will assemble with user description and then tell AI to user emacs mcp tools to debug. After user confirm the prompt, send to AI.
   ("d" "Debug Emacs runtime" ai-code-debug-emacs-runtime)
   ("h" "Help / Quick Start" ai-code-onboarding-open-quickstart))
 

test/test_ai-code-mcp-debug-tools.el

@@ -131,6 +131,20 @@
     (should-error
      (ai-code-mcp-eval-elisp "(+ 1 2)"))))
 
+(ert-deftest ai-code-test-mcp-debug-tools-errors-name-global-flags ()
+  "Global gating errors should point to the relevant defcustom names."
+  (let ((ai-code-mcp-debug-tools-enabled nil)
+        (ai-code-mcp-debug-tools-enable-eval-elisp nil))
+    (should (string-match-p
+             "ai-code-mcp-debug-tools-enabled"
+             (error-message-string
+              (should-error (ai-code-mcp-get-recent-messages)))))
+    (let ((ai-code-mcp-debug-tools-enabled t))
+      (should (string-match-p
+               "ai-code-mcp-debug-tools-enable-eval-elisp"
+               (error-message-string
+                (should-error (ai-code-mcp-eval-elisp "(+ 1 2)"))))))))
+
 (ert-deftest ai-code-test-mcp-tools-list-warns-eval-elisp-is-unrestricted ()
   "Eval tool metadata should warn about unrestricted side effects."
   (let ((ai-code-mcp-server-tools nil)

test/test_ai-code.el

@@ -622,6 +622,37 @@
     (should (string-match-p "Describe the Emacs runtime issue"
                             description-prompt))))
 
+(ert-deftest ai-code-test-debug-emacs-runtime-distinguishes-config-from-run-consent ()
+  "Debug Emacs runtime should separate global eval availability from per-run consent."
+  (let (confirm-read-args)
+    (let ((ai-code-mcp-debug-tools-enabled t)
+          (ai-code-mcp-debug-tools-enable-eval-elisp t))
+      (cl-letf (((symbol-function 'y-or-n-p)
+                 (lambda (_prompt) nil))
+                ((symbol-function 'ai-code-read-string)
+                 (lambda (prompt &optional initial-input _candidate-list)
+                   (if (string-match-p "Confirm and edit Emacs runtime debug prompt" prompt)
+                       (progn
+                         (setq confirm-read-args (list prompt initial-input))
+                         initial-input)
+                     "C-c x runs the wrong interactive command")))
+                ((symbol-function 'ai-code--insert-prompt)
+                 (lambda (&rest _args) nil)))
+        (ai-code-debug-emacs-runtime)))
+    (should (string-match-p
+             "eval_elisp is enabled in your Emacs MCP config"
+             (cadr confirm-read-args)))
+    (should (string-match-p
+             "not requested for this debugging run"
+             (cadr confirm-read-args)))))
+
+(ert-deftest ai-code-test-debug-emacs-runtime-removes-stale-done-comment ()
+  "The source should not keep the stale DONE note for the runtime debug menu item."
+  (with-temp-buffer
+    (insert-file-contents (expand-file-name "ai-code.el" default-directory))
+    (should-not
+     (search-forward ";; DONE: add a menu item: Debug your emacs runtime." nil t))))
+
 (ert-deftest ai-code-test-menu-ai-cli-session-includes-select-terminal-entry ()
   "Test that the AI CLI session menu exposes terminal backend selection."
   (let ((suffix (transient-get-suffix 'ai-code--menu-ai-cli-session "l")))