diff --git a/unraid_mcp/tools/array.py b/unraid_mcp/tools/array.py
index 12a863b..e409f72 100644
--- a/unraid_mcp/tools/array.py
+++ b/unraid_mcp/tools/array.py
@@ -5,11 +5,21 @@ Provides the `unraid_array` tool with 5 actions for parity check management.
 
 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.array.elicit_and_configure"
+# and "unraid_mcp.tools.array.CredentialsNotConfiguredError"
+elicit_and_configure = _elicit
+CredentialsNotConfiguredError = _CredErr
+Context = _Context
 
 
 QUERIES: dict[str, str] = {
@@ -69,6 +79,7 @@ def register_array_tool(mcp: FastMCP) -> None:
     async def unraid_array(
         action: ARRAY_ACTIONS,
         correct: bool | None = None,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Manage Unraid array parity checks.
 
@@ -86,7 +97,15 @@ def register_array_tool(mcp: FastMCP) -> None:
             logger.info(f"Executing unraid_array action={action}")
 
             if action in QUERIES:
-                data = await make_graphql_request(QUERIES[action])
+                try:
+                    data = await make_graphql_request(QUERIES[action])
+                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[action])
                 return {"success": True, "action": action, "data": data}
 
             query = MUTATIONS[action]
@@ -97,7 +116,15 @@ def register_array_tool(mcp: FastMCP) -> None:
                     raise ToolError("correct is required for 'parity_start' action")
                 variables = {"correct": correct}
 
-            data = await make_graphql_request(query, variables)
+            try:
+                data = await make_graphql_request(query, variables)
+            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(query, variables)
 
             return {
                 "success": True,