fix tests

Author: tninja

HISTORY.org

@@ -2,6 +2,13 @@
 * Release history
 
 ** Main branch change
+- Breaking: Remove =ai-code-mcp-editor-tools.el= and merge its remaining MCP tools into the core server and debug modules
+  - =editor_state= and =visible_buffers= are now built-in MCP tools in =ai-code-mcp-server.el=
+  - =eval_elisp= now lives in =ai-code-mcp-debug-tools.el= and is gated by =ai-code-mcp-debug-tools-enable-eval-elisp=
+  - Remove the legacy =messages_tail= tool in favor of =get_recent_messages=
+  - Remove the old =ai-code-mcp-editor-tools-enabled= and =ai-code-mcp-editor-tools-allow-effect-eval= settings
+  - Move the dedicated editor-tools tests into the server/debug MCP test files
+  - Update MCP docs and release notes to match the new tool layout
 
 ** 1.74
 - Fix: Guard eat/ghostel process filters against deleted buffers on exit and add regression tests

README.org

@@ -198,7 +198,7 @@ The generated prompt will include the function/region scope, visible file list,
 
 **** Built-in Emacs MCP Tools
 
-AI Code includes an Emacs MCP server with these core built-in tools:
+AI Code includes an Emacs MCP server with these built-in tools:
 - =project_info=: summarize the current project, active buffer, and file count
 - =editor_state=: inspect the currently selected buffer, point, mode, region, and buffer flags
 - =visible_buffers=: list the buffers visible in the selected frame windows
@@ -211,14 +211,14 @@ AI Code includes an Emacs MCP server with these core built-in tools:
 - =xref_find_definitions_at_point=: find definitions at a file location
 - =treesit_info=: inspect tree-sitter node information for a file location
 
-Optional debugging tools are registered from a separate module and are enabled by default:
+Additional debugging tools come from =ai-code-mcp-debug-tools.el= and are enabled by default:
 
 #+begin_src emacs-lisp
 (setq ai-code-mcp-debug-tools-enabled t)  ;; default
 ;; (setq ai-code-mcp-debug-tools-enabled nil) ;; disable them
 #+end_src
 
-When enabled, AI Code also registers:
+These tools add:
 - =get_variable_value=: return the printed value of an Emacs variable by name
 - =get_variable_binding_info=: inspect current and default bindings for an Emacs variable
 - =get_function_info=: inspect function metadata such as kind, aliasing, and advice state
@@ -227,15 +227,15 @@ When enabled, AI Code also registers:
 - =get_last_error_backtrace=: return the most recently recorded Emacs command error snapshot
 - =eval_elisp=: evaluate a single Emacs Lisp form in a chosen buffer context when explicitly enabled
 
-This split keeps the MCP core small while still exposing debugging-oriented tools by default.
+The old =ai-code-mcp-editor-tools.el= module has been removed. Its live-editor read tools are now built in, while =eval_elisp= remains an explicit opt-in.
 
-By default, =eval_elisp= is not registered. To opt in explicitly:
+To register =eval_elisp=:
 
 #+begin_src emacs-lisp
 (setq ai-code-mcp-debug-tools-enable-eval-elisp t)
 #+end_src
 
-By default, =eval_elisp= only allows =query= mode. To allow editor-local side effects too, opt in explicitly:
+=eval_elisp= only allows =query= mode by default. To allow editor-local side effects too:
 
 #+begin_src emacs-lisp
 (setq ai-code-mcp-debug-tools-allow-effect-eval t)
@@ -252,7 +252,7 @@ Set the backend to =claude-code=, =codex=, or =github-copilot-cli= and start a s
 - register the current project/buffer as the MCP session context
 - inject a session-scoped MCP config into that agent session automatically
 
-Today this auto-wiring is enabled for =claude-code=, =codex=, and =github-copilot-cli=. The adapter layer is designed so other backends can be added later.
+Auto-wiring is currently enabled for =claude-code=, =codex=, and =github-copilot-cli=.
 
 If you disabled it before, enable it again with:
 
@@ -272,10 +272,9 @@ If it shows =:backend=, =:session-id=, and a local =:server-url=, then Emacs has
 - use =imenu_list_symbols= for the current file
 - use =get_diagnostics= and summarize the current file diagnostics
 
-The status command only proves the Emacs side is wired.
-The real proof is that the started agent returns your current project path, buffer context, or current-file symbols from those tools.
+The status command only proves the Emacs side is wired. The real proof is that the agent returns your current project path, buffer context, or current-file symbols from those tools.
 
-***** Add New MCP function
+***** Add a New MCP Tool
 
 1. Define an Emacs Lisp function.
 
@@ -309,8 +308,7 @@ If the agent session is already running, restart it after registering the new to
 (ai-code-mcp-dispatch "tools/list")
 #+end_src
 
-If =current_buffer_name= appears in the tool list, Emacs has registered it.
-If the started agent can call it and returns the expected buffer name, the tool is available inside the AI coding agent.
+If =current_buffer_name= appears in the tool list, Emacs has registered it. If the agent can call it and returns the expected buffer name, the tool is available inside the AI coding session.
 
 ***** Use the MCP Core Directly from Elisp
 

test/test_ai-code-backends-infra.el

@@ -273,7 +273,7 @@
                    (setq captured-entry (car display-buffer-alist))
                    'fake-window))
                 ((symbol-function 'window-body-width)
-                 (lambda (_window) 96))
+                 (lambda (&rest _args) 96))
                 ((symbol-function 'window-resize)
                  (lambda (window delta horizontal)
                    (setq resize-call (list window delta horizontal)))))

test/test_ai-code-file.el

@@ -195,10 +195,10 @@ everything is cleaned up afterward."
          (opened-in-other-window nil)
          (ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test file")
                    ((string-match-p "Confirm" prompt) "test.txt"))))
@@ -223,10 +223,10 @@ everything is cleaned up afterward."
          (opened-in-dired nil)
          (ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "directory"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test directory")
                    ((string-match-p "Confirm" prompt) "test_dir"))))
@@ -250,10 +250,10 @@ everything is cleaned up afterward."
    (let ((created-file nil)
          (ai-code-task-use-gptel-filename t))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "user authentication module")
                    ((string-match-p "Confirm" prompt) initial-input)))) ; Accept suggested name
@@ -278,10 +278,10 @@ everything is cleaned up afterward."
    (let ((created-file nil)
          (ai-code-task-use-gptel-filename t))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test file")
                    ((string-match-p "Confirm" prompt) initial-input)))) ; Accept fallback
@@ -306,10 +306,10 @@ everything is cleaned up afterward."
    (let ((created-file nil)
          (ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (_prompt _collection &rest _args)
+               (lambda (_prompt _collection &rest _args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt)
                     "rdar://12345 Fix crash on startup")
@@ -334,10 +334,10 @@ everything is cleaned up afterward."
   (ai-code-file-with-test-env
    (let ((ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   ""))) ; Empty description
        ;; Should raise user-error
        (should-error (ai-code-create-file-or-dir) :type 'user-error)))))
@@ -347,10 +347,10 @@ everything is cleaned up afterward."
   (ai-code-file-with-test-env
    (let ((ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test file")
                    ((string-match-p "Confirm" prompt) "   "))))) ; Whitespace only
@@ -363,10 +363,10 @@ everything is cleaned up afterward."
    (let ((created-file nil)
          (ai-code-task-use-gptel-filename nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "nested file")
                    ((string-match-p "Confirm" prompt) "src_lib_utils.js"))))
@@ -389,10 +389,10 @@ everything is cleaned up afterward."
          (ai-code-task-use-gptel-filename t)
          (confirmation-shown nil))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "database connection")
                    ((string-match-p "Confirm" prompt)
@@ -423,10 +423,10 @@ everything is cleaned up afterward."
    (let ((created-file nil)
          (ai-code-task-use-gptel-filename t))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test")
                    ((string-match-p "Confirm" prompt)
@@ -453,10 +453,10 @@ everything is cleaned up afterward."
    (let ((created-dir nil)
          (ai-code-task-use-gptel-filename t))
      (cl-letf (((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "directory"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test")
                    ((string-match-p "Confirm" prompt)
@@ -492,10 +492,10 @@ everything is cleaned up afterward."
                 (lambda ()
                   dired-dir))
                ((symbol-function 'completing-read)
-                (lambda (prompt collection &rest args)
+               (lambda (prompt collection &rest args)
                   "file"))
                ((symbol-function 'read-string)
-                (lambda (prompt &optional initial-input)
+                (lambda (prompt &optional initial-input &rest _args)
                   (cond
                    ((string-match-p "Describe" prompt) "test")
                    ((string-match-p "Confirm" prompt)

test/test_ai-code-input.el

@@ -223,7 +223,7 @@
   (let ((ai-code-prompt-filepath-completion-enabled t))
     ;; Mock minibufferp to return true
     (cl-letf (((symbol-function 'minibufferp)
-               (lambda (&optional buffer) t))
+               (lambda (&rest _args) t))
               ((symbol-function 'ai-code--any-ai-session-active-p)
                (lambda () t))
               ((symbol-function 'magit-toplevel)
@@ -568,7 +568,7 @@
         (completion-called nil))
     ;; Mock minibufferp to return true
     (cl-letf (((symbol-function 'minibufferp)
-               (lambda (&optional buffer) t))
+               (lambda (&rest _args) t))
               ((symbol-function 'ai-code--any-ai-session-active-p)
                (lambda () t))
               ((symbol-function 'completion-at-point)

test/test_ai-code-prompt-mode.el

@@ -377,7 +377,7 @@ and ensures everything is cleaned up afterward."
 	                       ((string-match-p "Create task file in" prompt)
 	                        (format "ai-code-files-dir: %s" files-dir)))))
                     ((symbol-function 'read-string)
-                     (lambda (prompt &optional initial-input)
+                     (lambda (prompt &optional initial-input &rest _args)
                        (cond
                         ((string-match-p "URL" prompt) "https://example.com")
                         ((string-match-p "Confirm task filename" prompt) initial-input))))
@@ -571,7 +571,7 @@ and ensures everything is cleaned up afterward."
                        ((string-match-p "Create task file in" prompt)
                         (format "ai-code-files-dir: %s" files-dir)))))
                    ((symbol-function 'read-string)
-                    (lambda (prompt &optional _initial-input)
+                    (lambda (prompt &optional _initial-input &rest _args)
                       (cond
                        ((string-match-p "URL" prompt) "")
                        ;; User removes .org extension
@@ -615,7 +615,7 @@ and ensures everything is cleaned up afterward."
                        ((string-match-p "Create task file in" prompt)
                         (format "current directory: %s" default-directory)))))
                    ((symbol-function 'read-string)
-                    (lambda (prompt &optional _initial-input)
+                    (lambda (prompt &optional _initial-input &rest _args)
                       (cond
                        ((string-match-p "URL" prompt) "")
                        ((string-match-p "Confirm task filename" prompt) "task_20260101_my_task/"))))
@@ -1295,7 +1295,7 @@ and ensures everything is cleaned up afterward."
 
 (ert-deftest ai-code-test-prompt-auto-trigger-hash-in-minibuffer ()
   "Test that # auto-trigger doesn't work in minibuffer in prompt mode."
-  (cl-letf (((symbol-function 'minibufferp) (lambda (&optional buffer) t)))
+  (cl-letf (((symbol-function 'minibufferp) (lambda (&rest _args) t)))
     (with-temp-buffer
       (insert "@src/test.el#")
 
@@ -1339,7 +1339,7 @@ and ensures everything is cleaned up afterward."
 (ert-deftest ai-code-test-prompt-filepath-capf-in-minibuffer ()
   "Test that capf returns nil in minibuffer in prompt mode."
   (ai-code-with-test-repo
-   (cl-letf (((symbol-function 'minibufferp) (lambda (&optional buffer) t)))
+   (cl-letf (((symbol-function 'minibufferp) (lambda (&rest _args) t)))
      (with-temp-buffer
        (insert "@src/")
        (goto-char (point-max))