Consolidate editor tools and add opt-in eval_elisp

Author: tninja

README.org

@@ -200,6 +200,8 @@ The generated prompt will include the function/region scope, visible file list,
 
 AI Code includes an Emacs MCP server with these core 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
 - =buffer_query=: read buffer contents, optionally by line range
 - =get_diagnostics=: return Flycheck or Flymake diagnostics for one file or open project buffers
 - =get_project_files=: list regular files in the current project
@@ -223,25 +225,20 @@ When enabled, AI Code also registers:
 - =get_feature_load_state=: inspect whether an Emacs feature is loaded and where it comes from
 - =get_recent_messages=: return the latest lines from =*Messages*=
 - =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.
 
-Optional editor-session tools are available when you explicitly enable them:
+By default, =eval_elisp= is not registered. To opt in explicitly:
 
 #+begin_src emacs-lisp
-(setq ai-code-mcp-editor-tools-enabled t)
+(setq ai-code-mcp-debug-tools-enable-eval-elisp t)
 #+end_src
 
-When enabled, AI Code also registers:
-- =editor_state=: inspect the currently selected buffer, point, mode, region, and buffer flags
-- =visible_buffers=: list the buffers visible in the selected frame windows
-- =messages_tail=: return the latest lines from =*Messages*=
-- =eval_elisp=: evaluate a single Emacs Lisp form in a chosen buffer context
-
 By default, =eval_elisp= only allows =query= mode. To allow editor-local side effects too, opt in explicitly:
 
 #+begin_src emacs-lisp
-(setq ai-code-mcp-editor-tools-allow-effect-eval t)
+(setq ai-code-mcp-debug-tools-allow-effect-eval t)
 #+end_src
 
 screenshot inside Codex cli:

ai-code-autoloads.el

@@ -1021,9 +1021,6 @@ prompt for the project directory.
 (register-definition-prefixes "ai-code-mcp-debug-tools" '("ai-code-mcp-"))
 
 
-;;; Generated autoloads from ai-code-mcp-editor-tools.el
-
-(register-definition-prefixes "ai-code-mcp-editor-tools" '("ai-code-mcp-"))
 
 ;;; End of scraped data