Address MCP review feedback

Author: tninja

ai-code-mcp-debug-tools.el

@@ -161,6 +161,12 @@
    ((eq value :json-false) nil)
    (t (not (null value)))))
 
+(defun ai-code-mcp-debug-tools--selected-window ()
+  "Return the selected window, falling back to the frame root window."
+  (or (and (window-live-p (selected-window))
+           (selected-window))
+      (frame-root-window)))
+
 (defun ai-code-mcp-debug-tools--resolve-eval-buffer (&optional buffer-name file-path)
   "Return the requested live buffer from BUFFER-NAME or FILE-PATH."
   (when (and buffer-name file-path)
@@ -172,7 +178,7 @@
    (file-path
     (find-file-noselect (expand-file-name file-path) t))
    (t
-    (current-buffer))))
+    (window-buffer (ai-code-mcp-debug-tools--selected-window)))))
 
 (defun ai-code-mcp-debug-tools--point-line-column (buffer point)
   "Return line and column for POINT in BUFFER."

ai-code-mcp-server.el

@@ -178,13 +178,13 @@ Use `auto' to prefer Flycheck and then Flymake when available."
              :optional t))))
   "Built-in MCP tool specifications.
 
-	The default tool list includes:
-	- `project_info'
-	- `editor_state'
-	- `visible_buffers'
-	- `buffer_query'
-	- `get_diagnostics'
-	- `get_project_files'
+The default tool list includes:
+- `project_info'
+- `editor_state'
+- `visible_buffers'
+- `buffer_query'
+- `get_diagnostics'
+- `get_project_files'
 - `get_project_buffers'
 - `notify_user'
 - `imenu_list_symbols'

docs/emacs-mcp-use-cases.org

@@ -61,11 +61,13 @@ These are useful for code understanding, navigation, and diagnostics.
 
 ** Live editor MCP tools
 
-The built-in editor-session tools extend the MCP layer with
-live-editor awareness:
+The built-in editor-session tools expose live editor awareness:
 
 - =editor_state=
 - =visible_buffers=
+
+Related debug tools:
+
 - =get_recent_messages=
 - =eval_elisp= when explicitly enabled
 

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

@@ -146,6 +146,38 @@
       (when (buffer-live-p buffer)
         (kill-buffer buffer)))))
 
+(ert-deftest ai-code-test-mcp-eval-elisp-defaults-to-selected-window-buffer ()
+  "Eval should use the selected window buffer when no buffer context is given."
+  (let ((ai-code-mcp-server-tools nil)
+        (ai-code-mcp-debug-tools-enabled t)
+        (ai-code-mcp-debug-tools-enable-eval-elisp t)
+        (ai-code-mcp--sessions (make-hash-table :test 'equal))
+        (session-id "mcp-eval-session")
+        (session-buffer (generate-new-buffer " *ai-code-mcp-session*"))
+        (target-buffer (generate-new-buffer " *ai-code-mcp-target*")))
+    (unwind-protect
+        (save-window-excursion
+          (switch-to-buffer target-buffer)
+          (with-current-buffer session-buffer
+            (rename-buffer "mcp-session-buffer" t))
+          (with-current-buffer target-buffer
+            (rename-buffer "mcp-target-buffer" t))
+          (ai-code-mcp-register-session session-id default-directory session-buffer)
+          (let* ((ai-code-mcp--current-session-id session-id)
+                 (payload
+                  (ai-code-test-mcp-debug-tools--read-json-payload
+                   (ai-code-mcp-dispatch
+                    "tools/call"
+                    '((name . "eval_elisp")
+                      (arguments . ((code . "(buffer-name)"))))))))
+            (should (equal t (alist-get 'ok payload)))
+            (should (equal "\"mcp-target-buffer\""
+                           (alist-get 'value_repr payload)))))
+      (when (buffer-live-p session-buffer)
+        (kill-buffer session-buffer))
+      (when (buffer-live-p target-buffer)
+        (kill-buffer target-buffer)))))
+
 (ert-deftest ai-code-test-mcp-eval-elisp-query-rejects-denied-symbols ()
   "Query evaluation should reject denied symbols before running them."
   (let ((ai-code-mcp-server-tools nil)