refactor(tools): migrate config/integration admin tools to the registry (#4742)

mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-06-28 07:35:27 -04:00

Part of #3629 (the `admin_tools.py` bullet). Moves the config/integration admin
tools off the legacy elif dispatch chain in tool_implementations.py onto the
agent_tools registry:

  manage_endpoints, manage_mcp, manage_webhooks, manage_tokens, manage_settings

The do_* implementations (and manage_mcp's command-allowlist / RCE guard:
_validate_mcp_command, _mcp_allowed_commands, and the _MCP_* constants) move
verbatim into the new src/agent_tools/admin_tools.py. They register through a
single ADMIN_TOOL_HANDLERS map that TOOL_HANDLERS.update()s, and the five elif
branches plus their imports are dropped from tool_execution.py, so these tools
now flow through _direct_fallback like the other migrated clusters. The names
are re-exported from src.agent_tools for back-compat.

Dedup:
  - _parse_tool_args was duplicated in tool_implementations.py and
    document_tools.py. It now lives once in src.tool_utils (which imports nothing
    from the project beyond src.constants, so this introduces no cycle) and both
    call sites import it from there. The orphaned `import json` in document_tools
    is removed with it.
  - The five tools share one _owner_adapter(fn) factory that threads ctx["owner"]
    into the owner-taking do_* signature, instead of five near-identical wrappers.

Tests: new tests/test_admin_tools_registry.py pins the registration, the
re-export back-compat, the owner-threading adapter, and the single-source
_parse_tool_args (across admin_tools and document_tools). Existing MCP /
settings / webhook suites are repointed at the new module.

This commit is contained in:

Kenny Van de Maele

2026-06-24 09:29:10 +02:00

committed by

GitHub

parent e0ccf250a4

commit 5ce2056521

12 changed files with 912 additions and 848 deletions

									
										tests/test_manage_mcp_command_allowlist.py
									
		+2
		-2
	
												View File
												
				@@ -26,8 +26,8 @@ clear_fake_database_modules()

				import core.database as cdb

				from core.database import McpServer

				import src.tool_implementations as ti

				from src.tool_implementations import _validate_mcp_command

				import src.agent_tools.admin_tools as ti  # do_manage_mcp/get_mcp_manager moved here in the registry migration

				from src.agent_tools.admin_tools import _validate_mcp_command

				_TS, _ENGINE, _TMPDB = make_temp_sqlite(cdb.Base.metadata)