From dec80832ea13fa492ca6546eea421279fe82214f Mon Sep 17 00:00:00 2001 From: Jacob Magar Date: Sat, 14 Mar 2026 04:16:54 -0400 Subject: [PATCH] feat(elicitation): add ctx + credential elicitation to unraid_rclone --- unraid_mcp/tools/rclone.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/unraid_mcp/tools/rclone.py b/unraid_mcp/tools/rclone.py index 7b4b846..df59df8 100644 --- a/unraid_mcp/tools/rclone.py +++ b/unraid_mcp/tools/rclone.py @@ -7,11 +7,21 @@ cloud storage remotes (S3, Google Drive, Dropbox, FTP, etc.). import re from typing import Any, Literal, get_args +from fastmcp import Context as _Context from fastmcp import FastMCP from ..config.logging import logger from ..core.client import make_graphql_request +from ..core.exceptions import CredentialsNotConfiguredError as _CredErr from ..core.exceptions import ToolError, tool_error_handler +from ..core.setup import elicit_and_configure as _elicit + + +# Re-export at module scope so tests can patch "unraid_mcp.tools.rclone.elicit_and_configure" +# and "unraid_mcp.tools.rclone.CredentialsNotConfiguredError" +elicit_and_configure = _elicit +CredentialsNotConfiguredError = _CredErr +Context = _Context QUERIES: dict[str, str] = { @@ -114,6 +124,7 @@ def register_rclone_tool(mcp: FastMCP) -> None: name: str | None = None, provider_type: str | None = None, config_data: dict[str, Any] | None = None, + ctx: Context | None = None, ) -> dict[str, Any]: """Manage RClone cloud storage remotes. @@ -133,7 +144,15 @@ def register_rclone_tool(mcp: FastMCP) -> None: logger.info(f"Executing unraid_rclone action={action}") if action == "list_remotes": - data = await make_graphql_request(QUERIES["list_remotes"]) + try: + data = await make_graphql_request(QUERIES["list_remotes"]) + except CredentialsNotConfiguredError: + configured = await elicit_and_configure(ctx) + if not configured: + raise ToolError( + "Credentials required. Run `unraid_health action=setup` to configure." + ) + data = await make_graphql_request(QUERIES["list_remotes"]) remotes = data.get("rclone", {}).get("remotes", []) return {"remotes": list(remotes) if isinstance(remotes, list) else []}