kubectl-mcp-server 1.22.0__py3-none-any.whl → 1.23.1__py3-none-any.whl

{kubectl_mcp_server-1.22.0.dist-info → kubectl_mcp_server-1.23.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubectl-mcp-server
-Version: 1.22.0
+Version: 1.23.1
 Summary: A Model Context Protocol (MCP) server for Kubernetes with 270+ tools, 8 resources, and 8 prompts
 Home-page: https://github.com/rohitg00/kubectl-mcp-server
 Author: Rohit Ghumare

{kubectl_mcp_server-1.22.0.dist-info → kubectl_mcp_server-1.23.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-kubectl_mcp_server-1.22.0.dist-info/licenses/LICENSE,sha256=nH9Z0W0WNH2oQ4cPrBAU8ldDcHfeI6NUbkSGiazYWgQ,1070
-kubectl_mcp_tool/__init__.py,sha256=aOJUw-ueQaKnSHF0Tid1B-rwVKQZfXqcDV2S2-9f3WY,580
+kubectl_mcp_server-1.23.1.dist-info/licenses/LICENSE,sha256=nH9Z0W0WNH2oQ4cPrBAU8ldDcHfeI6NUbkSGiazYWgQ,1070
+kubectl_mcp_tool/__init__.py,sha256=kA6EKH7Jawvme4pUaNXL97G-_8OkUptR_PK5Htjy6W0,580
 kubectl_mcp_tool/__main__.py,sha256=CE6cTD6PA71Ap0i5_gE17Pb9FcedOJmtGRNzZ5-TFSc,1490
 kubectl_mcp_tool/crd_detector.py,sha256=xLZSyg3iIe_MjSMI3mESe2VK8wGJzu40rJ7F72fULBs,7139
 kubectl_mcp_tool/diagnostics.py,sha256=uwolSoHadRkB-J8PAsabbexfj6sTNCIIRRrABBRXoTU,11776
-kubectl_mcp_tool/k8s_config.py,sha256=NK8y4Un03Y-sOPIHM-hrR_PA-8BtdoXzyRZWuhMJIok,17909
-kubectl_mcp_tool/mcp_server.py,sha256=bCNR_a_A9p3nctBmFCqnNghepEpYot_o1WcLIjYseYs,32691
-kubectl_mcp_tool/providers.py,sha256=_LMpVbCWgFrsRO_u4krSw7wFNYapzp29WtiEh-sbBeY,11521
-kubectl_mcp_tool/safety.py,sha256=7bx7tUH_hT4Y_eTnpH5knnHTsvnIZvI_0oo9MSBe_z8,5036
+kubectl_mcp_tool/k8s_config.py,sha256=XePmWOS_cfFFaxG5HjmqGQrtEr8MWOVrYAB4eAipaPg,18950
+kubectl_mcp_tool/mcp_server.py,sha256=EdKWJWdgmQgbnKYyb_1W1F54aiKsDciViRWxVb4mKsY,32056
+kubectl_mcp_tool/providers.py,sha256=gaU9mB0p6ygqbxC--e4E60TwfC8FzW_sVWvc8OWK07I,12805
+kubectl_mcp_tool/safety.py,sha256=l9wb3hhdlr-Yifai_0fDutZvC4sW2HQtrgfuaJWjFjc,3472
 kubectl_mcp_tool/auth/__init__.py,sha256=ot8ivZZkDtV8Rg0y1UYruwobKCPyxX1svqh35wWxKvY,347
 kubectl_mcp_tool/auth/config.py,sha256=wi3wuJNMyDqMeluDHL0MaJyedIFv5CFVxiUaEVaTvzk,2267
 kubectl_mcp_tool/auth/scopes.py,sha256=KPmuGO0SrTkjzlElWFOV29ie9apTdMklOCkiA-965lI,6147
@@ -30,52 +30,53 @@ kubectl_mcp_tool/prompts/prompts.py,sha256=ogDhU6FVsYIlig_QuIw-TblxR9GQJ3Xp8mJHL
 kubectl_mcp_tool/resources/__init__.py,sha256=ERkn0ErlaGi9-dybv4wrAaT8WretvNp6K002h7Agjno,83
 kubectl_mcp_tool/resources/resources.py,sha256=kvK4OM3Ox5cFvWDqJBTXOfBgnRYdoqdvvjsdCg0PJfY,12713
 kubectl_mcp_tool/tools/__init__.py,sha256=ktvGmS_bUqYhv3J65dtQrrj2B8K7r9WTnS2_dbAGp_U,1955
+kubectl_mcp_tool/tools/_cli_utils.py,sha256=lCJzvK1HOsdAfO_1yMhwjLfK8k78OCuQ3kDgngMYOw8,2204
 kubectl_mcp_tool/tools/backup.py,sha256=M1dvyc-fmCbGFp3o89pGNv8drtgPxds0sBk0OiN0TJA,29148
 kubectl_mcp_tool/tools/browser.py,sha256=OvXUHzEuciRQInnwLLC16iObOOdniu09b9RT81y7sdc,25338
 kubectl_mcp_tool/tools/capi.py,sha256=qcNStWl7KHqi4Jorf9xThfOjYRhp7d3ZhUGif_YWrV8,24293
 kubectl_mcp_tool/tools/certs.py,sha256=82FVevhLSaMTGDyu3rxJNhmiL_3KzBqFwys186b_2IM,25035
 kubectl_mcp_tool/tools/cilium.py,sha256=ijO-HWcS3R5FVzg1RrE-pKhrEL0SdG0CNyrQ6g0S8eM,18654
-kubectl_mcp_tool/tools/cluster.py,sha256=K8MGinOmzk0850dVB332693SadseAzgYf3jV-IKxmNM,54419
-kubectl_mcp_tool/tools/core.py,sha256=67Cx1z4DqV0Qd26yXkF1eBXbUIlBB3Qj2W8rOInvb54,17801
-kubectl_mcp_tool/tools/cost.py,sha256=fcFlIv-bsMdKESw-l-T6ECsUplDukNHaqM76JCYVHvQ,29629
-kubectl_mcp_tool/tools/deployments.py,sha256=e138KV30DQhLCnvXntrofx1XdLH0dC0_mlODbzkluKk,18329
-kubectl_mcp_tool/tools/diagnostics.py,sha256=LGpW-cx2ui40IIq4pZPT2O8nVzKCpOEVnnQ1OGUSVt0,7864
+kubectl_mcp_tool/tools/cluster.py,sha256=wT_fePVC7QNgwO1IOT2v6uGbkzJQ3J9kG3ikCHIY0ik,54287
+kubectl_mcp_tool/tools/core.py,sha256=Viyn4R2Av-jchcSZA6hIrV_YeOjj3Ysts4hftZvMXoc,17650
+kubectl_mcp_tool/tools/cost.py,sha256=CTS6R0KPUq9_CWDxEU5by6l38aBD6zKU2_URXrduWp8,29546
+kubectl_mcp_tool/tools/deployments.py,sha256=dCsIaGt0ssk60G60iInZz9ssGAeuiZL4LuBOSWD864o,18178
+kubectl_mcp_tool/tools/diagnostics.py,sha256=i8d4ydbyIlE4YS3MegpDpDuRUiQb6q9XxLQK-dcmxFo,7709
 kubectl_mcp_tool/tools/gitops.py,sha256=aILtjkYI6QovPfsj5sdJDnkxvmzw5Ojzf8MDcpe2ns0,19168
-kubectl_mcp_tool/tools/helm.py,sha256=v_d1aH79VCKJmFi-kXG1LwzZRw6OFToyVC7D9tEp99A,61658
+kubectl_mcp_tool/tools/helm.py,sha256=mS3RsUQpjQ_euRQA7Os0l3XS6EyFakyyg9qaLXLMIok,60732
 kubectl_mcp_tool/tools/keda.py,sha256=nxoGkLGWrBQmNpN_gFIk4AUxInwOak6HutgGz1nyWtc,14811
 kubectl_mcp_tool/tools/kiali.py,sha256=tPGH-wpXqhwmW7XfSQ5KldUD0ihe2yuy8NBvmD8Xn74,20531
-kubectl_mcp_tool/tools/kind.py,sha256=fWyWGbiI60t6vUPGeAqIXwtkAGjquwv8jliCZBu6JVA,52317
+kubectl_mcp_tool/tools/kind.py,sha256=KGT7FS_SfPyS752Tc6Jb0NLQXN9Jz6tj7uAPHJ__tcI,52187
 kubectl_mcp_tool/tools/kubevirt.py,sha256=1M4xdihTQabH4O7NVoceQ3DQ11si_gbX1-bMDK5VOkw,25549
-kubectl_mcp_tool/tools/networking.py,sha256=5I-2SHp2kK9OyGJJ9KUU0hetlYoREIfin1J6CJA6HVQ,14309
-kubectl_mcp_tool/tools/operations.py,sha256=c7j1quXwRDoB9pMkmnLZ5Mk4QoCAuEzWVXJl_hmg2tc,24862
-kubectl_mcp_tool/tools/pods.py,sha256=isl-uhuSGrzR78U8d2ePqt4D_4rO_qSTZo5-5N_TFYQ,31252
+kubectl_mcp_tool/tools/networking.py,sha256=5Fj3ULC-psub65_gziWVbyfIPeKIsPeKqTMUbOziJ54,14482
+kubectl_mcp_tool/tools/operations.py,sha256=UoSAAFwzVTBOPHk533mVtjf1VMjbgrCHizK26YHUTI8,26163
+kubectl_mcp_tool/tools/pods.py,sha256=MT7tghx03ru7aQyt6bWcNJ4tC7Oq1TqoxNaYK85XxPg,31300
 kubectl_mcp_tool/tools/policy.py,sha256=Iz5YPpHUOLFySknFY-sGxw699s9HHtHp18vEzw72X-8,20475
 kubectl_mcp_tool/tools/rollouts.py,sha256=OtFAe2KIoN6fY4gv-f7WoiYAcQOGQaSJB-y6kI8UQvM,24568
 kubectl_mcp_tool/tools/security.py,sha256=d7WLj-JZwr-0opzkRNWyPdMykvBjdsDCBSZHovDIPLo,13971
 kubectl_mcp_tool/tools/storage.py,sha256=ILI3X5GYXASCETqg3A7X33B7PjwD5UsxL-iDG7yTi_8,5676
 kubectl_mcp_tool/tools/ui.py,sha256=HHi0KM2JTvZFpQjo5V6XkJf02hxFoasec7uyNY5wuuo,39702
 kubectl_mcp_tool/tools/utils.py,sha256=HvJoW6xa8duPf9omFdxWPnVGF5fSPnz6xfoCuwwCb_4,1416
-kubectl_mcp_tool/tools/vind.py,sha256=Sw_ubZRsY-hk7Rui8OlwhylUs2epmCa8j74Q2CdEJaA,21721
+kubectl_mcp_tool/tools/vind.py,sha256=bAZM_SD-lKMjGafCeFEwXNXvZmqZ9Gyri2NqHg4t5sw,21573
 kubectl_mcp_tool/utils/__init__.py,sha256=CHBCpaXwt994DlqyRFkkRky2TK8OmmDl0Gyc28369gI,348
 kubectl_mcp_tool/utils/helpers.py,sha256=W--wiVSKKqmjpxxdLT0J6rmhOQcp1OFk9jLrtQUVpGw,2444
 tests/__init__.py,sha256=qZPXYXv3whkkWhi61Ngzj09GHnIFlVSZrajE0XRk55o,290
 tests/conftest.py,sha256=6054YlpuGleV3Wg8BnVj4lnKWhGk-Eqc9JYTXxOmsXs,10782
 tests/test_auth.py,sha256=PoESfWiN92wSGUdVwLL3Z1AP6C1zUsVmgTI7Q8ZdlxM,11074
-tests/test_browser.py,sha256=6rB6Atqq3b2-xWnKzFdCVFHbF2Q3nt2Dy8Rp4ZwIgNk,20621
+tests/test_browser.py,sha256=g-Hv60wiwZ8kgNC0WJ7VJ1D3KFAnWTn3RijDhzW0vnQ,20539
 tests/test_cli.py,sha256=G-f9uByWooe-yUOH0ahBdoft4uz8TC0R0OzDs1Lom-4,10014
 tests/test_config.py,sha256=9_A6_ntjvX556GvFvHGHuel1ERGo-WrbnFJX8OniUvg,12568
-tests/test_ecosystem.py,sha256=SkxDWAASELIxzaYWu0d-Rw1HaKSSlyMMenwwF2HWvSA,13227
+tests/test_ecosystem.py,sha256=gKq9xPcoX2R49oXfHUEbIFK64vXNniFZpmTzzk3iTrk,13113
 tests/test_kind.py,sha256=1vUNXz-cNcjQcaomytH3t_CG2wA3_H6uuqrl3SD-Rrs,45961
-tests/test_mcp_integration.py,sha256=9ePvu1MJ0mTnMRFHthDwl3D2jyVPgQ1beUbchpT8Y3M,8782
+tests/test_mcp_integration.py,sha256=arREaEJ7VQ_4cQ_V8-fSuSO4LBBDVvzOPrEiIDiWC90,8063
 tests/test_observability.py,sha256=m0m-uIQrE9OJ3FFls_rVZJst3NeAFKRtNUZohFpIZE4,17829
 tests/test_prompts.py,sha256=VzZAXr5iFO-hG8kRwRnG4wom2LlqOmZ-SeW4d3HQ7hc,42888
 tests/test_resources.py,sha256=Z0Ex8WdRz-B3VZa1s0eAaDDGbhy7dRdqy1uFVOe2Qbo,12689
-tests/test_safety.py,sha256=5IOBQbcH2r8tANQD7ymsR6pBc6O50IspcFsuwrnwh1M,8292
-tests/test_server.py,sha256=lLvgbqutnivSgQMNrki0O48whBQt0UXjdwT047nf0nw,14415
-tests/test_tools.py,sha256=qZsyaXV-US1O05hNsIDNXjZmeZlg-kIPStM1r8hxySo,36711
+tests/test_safety.py,sha256=SKmfHJpEoQmn6K70KIJS1T-Z9k0jmsdyPKaS1UYFImE,3638
+tests/test_server.py,sha256=_rdUblJG0DmZbkEfBgU1H4vZHExAlTj-v1SIbekSVjk,14347
+tests/test_tools.py,sha256=CrG74XmHCvf6BEc2VxaS8nE74aPjAWRkr-f2lqYFUDw,37271
 tests/test_vind.py,sha256=L3q6yOXlhbVXwjuH-5YRRnauEO8q4LBOUBB_RGqSTfk,19003
-kubectl_mcp_server-1.22.0.dist-info/METADATA,sha256=f4Nx_FchIDzCJSfiXAz4QPJ4XH6JqsQNPNcLun06k3c,43396
-kubectl_mcp_server-1.22.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-kubectl_mcp_server-1.22.0.dist-info/entry_points.txt,sha256=zeOxQGaNC4r58deEmqsLCU5hfMjF0VqFUt9P5wWsKEM,109
-kubectl_mcp_server-1.22.0.dist-info/top_level.txt,sha256=o5IpfOGG-lqU8rVWJeK9aYC0r4f6qEX09QiBhZlYbkQ,23
-kubectl_mcp_server-1.22.0.dist-info/RECORD,,
+kubectl_mcp_server-1.23.1.dist-info/METADATA,sha256=7Wf_HEIiKcqd6QpekGzexH5jQqD-CqJHMd3wku7J2bg,43396
+kubectl_mcp_server-1.23.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+kubectl_mcp_server-1.23.1.dist-info/entry_points.txt,sha256=zeOxQGaNC4r58deEmqsLCU5hfMjF0VqFUt9P5wWsKEM,109
+kubectl_mcp_server-1.23.1.dist-info/top_level.txt,sha256=o5IpfOGG-lqU8rVWJeK9aYC0r4f6qEX09QiBhZlYbkQ,23
+kubectl_mcp_server-1.23.1.dist-info/RECORD,,

kubectl_mcp_tool/__init__.py

@@ -7,7 +7,7 @@ with Kubernetes clusters through natural language commands.
 For more information, see: https://github.com/rohitg00/kubectl-mcp-server
 """
 
-__version__ = "1.22.0"
+__version__ = "1.23.1"
 
 from .mcp_server import MCPServer
 from .diagnostics import run_diagnostics, check_kubectl_installation, check_cluster_connection

kubectl_mcp_tool/k8s_config.py

@@ -203,6 +203,7 @@ try:
         KubernetesProvider,
         ProviderConfig,
         ProviderType,
+        ProviderError,
         UnknownContextError,
         get_provider,
         get_context_names,
@@ -262,9 +263,21 @@ def load_kubernetes_config(context: str = ""):
 
 
 def _patched_load_kube_config(*args, **kwargs):
-    """Patched version of load_kube_config that tries in-cluster first."""
+    """Patched version of load_kube_config that tries in-cluster first.
+
+    When called with explicit arguments (config_file, context, client_configuration),
+    always pass through to the original function. Only try in-cluster as a
+    fallback for bare calls during initial module loading.
+    """
     global _config_loaded, _original_load_kube_config
 
+    has_explicit_args = bool(args) or bool(kwargs)
+
+    if has_explicit_args and _original_load_kube_config:
+        _original_load_kube_config(*args, **kwargs)
+        _config_loaded = True
+        return
+
     if _config_loaded:
         return
 
@@ -326,7 +339,7 @@ def _load_config_for_context(context: str = "") -> Any:
         try:
             provider = get_provider()
             return provider.get_api_client(context)
-        except UnknownContextError:
+        except (UnknownContextError, ProviderError):
             raise
         except Exception as e:
             logger.warning(f"Provider failed, falling back to basic config: {e}")
@@ -338,11 +351,20 @@ def _load_config_for_context(context: str = "") -> Any:
         config.load_incluster_config()
         return client.ApiClient()
     except ConfigException:
-        pass
+        logger.debug("In-cluster config not available in fallback path")
 
     kubeconfig_path = os.environ.get('KUBECONFIG', '~/.kube/config')
     kubeconfig_path = os.path.expanduser(kubeconfig_path)
 
+    if not os.path.exists(kubeconfig_path):
+        raise RuntimeError(
+            f"No Kubernetes configuration found. "
+            f"In-cluster config not available and kubeconfig not found at '{kubeconfig_path}'. "
+            f"If running in a Kubernetes pod, ensure the ServiceAccount token is mounted "
+            f"and KUBERNETES_SERVICE_HOST/KUBERNETES_SERVICE_PORT env vars are set. "
+            f"Set MCP_K8S_PROVIDER=in-cluster for in-cluster deployments."
+        )
+
     api_config = client.Configuration()
 
     if context:
@@ -543,7 +565,8 @@ _BASE_EXPORTS = [
 if _HAS_PROVIDER:
     __all__ = _BASE_EXPORTS + [
         "KubernetesProvider", "ProviderConfig", "ProviderType",
-        "UnknownContextError", "get_provider", "validate_context",
+        "ProviderError", "UnknownContextError",
+        "get_provider", "validate_context",
     ]
 else:
     __all__ = _BASE_EXPORTS

kubectl_mcp_tool/mcp_server.py

@@ -23,15 +23,10 @@ import logging
 import asyncio
 import os
 import platform
-import signal
-from pathlib import Path
 from typing import List, Optional, Any, Dict
 
-# Import k8s_config early to patch kubernetes config for in-cluster support
-# This must be done before any tools are imported
 import kubectl_mcp_tool.k8s_config  # noqa: F401
 
-# Import safety mode for operation control
 from kubectl_mcp_tool.safety import (
     SafetyMode,
     set_safety_mode,
@@ -39,7 +34,6 @@ from kubectl_mcp_tool.safety import (
     get_mode_info,
 )
 
-# Import observability for metrics and tracing
 from kubectl_mcp_tool.observability import (
     get_stats_collector,
     get_metrics,
@@ -52,7 +46,6 @@ from kubectl_mcp_tool.observability import (
     record_tool_error_metric,
 )
 
-# Import config loader
 from kubectl_mcp_tool.config import (
     load_config,
     get_config,
@@ -60,12 +53,13 @@ from kubectl_mcp_tool.config import (
     setup_sighup_handler,
 )
 
-# Import custom prompts
 from kubectl_mcp_tool.prompts import (
     load_prompts_from_config,
     get_builtin_prompts,
 )
 
+from kubectl_mcp_tool import __version__
+
 from kubectl_mcp_tool.tools import (
     register_helm_tools,
     register_pod_tools,
@@ -134,23 +128,13 @@ for handler in logging.root.handlers[:]:
     if isinstance(handler, logging.StreamHandler) and handler.stream == sys.stdout:
         logging.root.removeHandler(handler)
 
-# FastMCP 3 from gofastmcp.com (standalone package)
-# To revert to official SDK: from mcp.server.fastmcp import FastMCP
 try:
     from fastmcp import FastMCP
-except ImportError:
-    logger.error("FastMCP not found. Installing...")
-    import subprocess
-    try:
-        subprocess.check_call(
-            [sys.executable, "-m", "pip", "install", "fastmcp>=3.0.0b1"],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL
-        )
-        from fastmcp import FastMCP
-    except Exception as e:
-        logger.error(f"Failed to install FastMCP: {e}")
-        raise
+except ImportError as err:
+    raise ImportError(
+        "FastMCP is required but not installed. "
+        "Install with: pip install 'fastmcp>=3.0.0b1'"
+    ) from err
 
 
 class MCPServer:
@@ -622,7 +606,7 @@ class MCPServer:
                         },
                         "serverInfo": {
                             "name": self.name,
-                            "version": "1.2.0"
+                            "version": __version__
                         }
                     }
                 elif method == "tools/list":

kubectl_mcp_tool/providers.py

@@ -3,7 +3,6 @@ import logging
 from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple
 from dataclasses import dataclass, field
-from functools import lru_cache
 
 logger = logging.getLogger("mcp-server")
 
@@ -150,8 +149,37 @@ class KubernetesProvider:
             raise ProviderError(f"Failed to load context '{self.config.context}': {e}")
 
     def _initialize_kubeconfig(self):
-        """Initialize for multi-cluster kubeconfig provider."""
+        """Initialize for multi-cluster kubeconfig provider.
+
+        Falls back to in-cluster config if kubeconfig file is not found.
+        """
         from kubernetes import config
+        from kubernetes.config.config_exception import ConfigException
+
+        kubeconfig_exists = os.path.exists(self.config.kubeconfig_path)
+
+        if not kubeconfig_exists:
+            try:
+                config.load_incluster_config()
+                self._in_cluster = True
+                self._active_context = "in-cluster"
+                self._contexts_cache = []
+                logger.info(
+                    f"Kubeconfig not found at {self.config.kubeconfig_path}, "
+                    f"using in-cluster config"
+                )
+                return
+            except ConfigException:
+                raise ProviderError(
+                    f"No Kubernetes configuration found. "
+                    f"Kubeconfig not found at '{self.config.kubeconfig_path}' and "
+                    f"in-cluster config is not available. "
+                    f"Ensure a valid kubeconfig exists, or if running inside a "
+                    f"Kubernetes pod, verify the ServiceAccount token is mounted "
+                    f"and KUBERNETES_SERVICE_HOST/KUBERNETES_SERVICE_PORT env vars "
+                    f"are set. For in-cluster deployments, set "
+                    f"MCP_K8S_PROVIDER=in-cluster."
+                )
 
         try:
             contexts, active = config.list_kube_config_contexts(

kubectl_mcp_tool/safety.py

@@ -5,8 +5,7 @@ Provides read-only and disable-destructive modes to prevent accidental cluster m
 """
 
 from enum import Enum
-from functools import wraps
-from typing import Any, Callable, Dict, Set
+from typing import Any, Dict, Set
 import logging
 
 logger = logging.getLogger("mcp-server")
@@ -86,57 +85,6 @@ def set_safety_mode(mode: SafetyMode) -> None:
     logger.info(f"Safety mode set to: {mode.value}")
 
 
-def is_operation_allowed(operation_name: str) -> tuple[bool, str]:
-    """
-    Check if an operation is allowed under the current safety mode.
-
-    Returns:
-        Tuple of (allowed: bool, reason: str)
-    """
-    mode = get_safety_mode()
-
-    if mode == SafetyMode.NORMAL:
-        return True, ""
-
-    if mode == SafetyMode.READ_ONLY:
-        if operation_name in WRITE_OPERATIONS or operation_name in DESTRUCTIVE_OPERATIONS:
-            return False, f"Operation '{operation_name}' blocked: read-only mode is enabled"
-
-    if mode == SafetyMode.DISABLE_DESTRUCTIVE:
-        if operation_name in DESTRUCTIVE_OPERATIONS:
-            return False, f"Operation '{operation_name}' blocked: destructive operations are disabled"
-
-    return True, ""
-
-
-def check_safety_mode(func: Callable) -> Callable:
-    """
-    Decorator to check safety mode before executing a tool function.
-
-    Usage:
-        @check_safety_mode
-        def delete_pod(...):
-            ...
-    """
-    @wraps(func)
-    def wrapper(*args, **kwargs) -> Dict[str, Any]:
-        operation_name = func.__name__
-        allowed, reason = is_operation_allowed(operation_name)
-
-        if not allowed:
-            logger.warning(f"Blocked operation: {operation_name} (mode: {get_safety_mode().value})")
-            return {
-                "success": False,
-                "error": reason,
-                "blocked_by": get_safety_mode().value,
-                "operation": operation_name
-            }
-
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
 def get_mode_info() -> Dict[str, Any]:
     """Get information about the current safety mode."""
     mode = get_safety_mode()

kubectl_mcp_tool/tools/_cli_utils.py

@@ -0,0 +1,75 @@
+import subprocess
+from functools import lru_cache
+from typing import Any, Dict, List, Optional
+
+
+@lru_cache(maxsize=16)
+def cli_available(binary: str) -> bool:
+    """Check if a CLI binary is available (cached)."""
+    try:
+        result = subprocess.run(
+            [binary, "version"],
+            capture_output=True,
+            timeout=10
+        )
+        return result.returncode == 0
+    except Exception:
+        return False
+
+
+@lru_cache(maxsize=16)
+def get_cli_version(binary: str) -> Optional[str]:
+    """Get CLI binary version string (cached)."""
+    try:
+        result = subprocess.run(
+            [binary, "version"],
+            capture_output=True,
+            text=True,
+            timeout=10
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+        return None
+    except Exception:
+        return None
+
+
+def run_cli(
+    binary: str,
+    args: List[str],
+    timeout: int = 300,
+    capture_output: bool = True
+) -> Dict[str, Any]:
+    """Run a CLI command and return a standardized result dict.
+
+    Args:
+        binary: CLI binary name (e.g., "kind", "vcluster", "helm")
+        args: Command arguments (without the binary prefix)
+        timeout: Command timeout in seconds
+        capture_output: Whether to capture stdout/stderr
+
+    Returns:
+        Dict with success status and output/error
+    """
+    cmd = [binary, *args]
+
+    try:
+        result = subprocess.run(
+            cmd,
+            capture_output=capture_output,
+            text=True,
+            timeout=timeout
+        )
+        if result.returncode == 0:
+            output = result.stdout.strip() if capture_output else ""
+            return {"success": True, "output": output}
+        return {
+            "success": False,
+            "error": result.stderr.strip() if capture_output else f"Command failed with exit code {result.returncode}"
+        }
+    except subprocess.TimeoutExpired:
+        return {"success": False, "error": f"Command timed out after {timeout} seconds"}
+    except FileNotFoundError:
+        return {"success": False, "error": f"{binary} CLI not available"}
+    except Exception as e:
+        return {"success": False, "error": str(e)}

kubectl_mcp_tool/tools/cluster.py

@@ -23,18 +23,12 @@ from kubectl_mcp_tool.k8s_config import (
     disable_kubeconfig_watch,
     is_stateless_mode,
     set_stateless_mode,
+    _get_kubectl_context_args,
 )
 
 logger = logging.getLogger("mcp-server")
 
 
-def _get_kubectl_context_args(context: str = "") -> List[str]:
-    """Get kubectl context arguments."""
-    if context:
-        return ["--context", context]
-    return []
-
-
 # DNS-1123 subdomain regex for node name validation
 _DNS_1123_PATTERN = re.compile(r'^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$')
 
@@ -60,7 +54,7 @@ def _validate_node_name(name: str) -> tuple:
     return True, None
 
 
-def register_cluster_tools(server, non_destructive: bool):
+def register_cluster_tools(server: "FastMCP", non_destructive: bool):
     """Register cluster and context management tools."""
 
     @server.tool(

kubectl_mcp_tool/tools/core.py

@@ -7,19 +7,13 @@ from mcp.types import ToolAnnotations
 from ..k8s_config import (
     get_k8s_client,
     get_apiextensions_client,
+    _get_kubectl_context_args,
 )
 
 logger = logging.getLogger("mcp-server")
 
 
-def _get_kubectl_context_args(context: str) -> List[str]:
-    """Get kubectl context arguments if context is specified."""
-    if context:
-        return ["--context", context]
-    return []
-
-
-def register_core_tools(server, non_destructive: bool):
+def register_core_tools(server: "FastMCP", non_destructive: bool):
     """Register core Kubernetes resource tools."""
 
     @server.tool(

kubectl_mcp_tool/tools/cost.py

@@ -6,18 +6,11 @@ from typing import Any, Dict, List, Optional
 
 from mcp.types import ToolAnnotations
 
-from ..k8s_config import get_k8s_client, get_apps_client
+from ..k8s_config import get_k8s_client, get_apps_client, _get_kubectl_context_args
 
 logger = logging.getLogger("mcp-server")
 
 
-def _get_kubectl_context_args(context: str) -> List[str]:
-    """Get kubectl context arguments if context is specified."""
-    if context:
-        return ["--context", context]
-    return []
-
-
 def _parse_cpu(cpu_str: str) -> int:
     """Parse CPU string to millicores."""
     try:
@@ -28,7 +21,7 @@ def _parse_cpu(cpu_str: str) -> int:
             return int(cpu_str[:-1]) // 1000000
         else:
             return int(float(cpu_str) * 1000)
-    except:
+    except (ValueError, TypeError):
         return 0
 
 
@@ -50,7 +43,7 @@ def _parse_memory(mem_str: str) -> int:
             return int(mem_str[:-1]) * 1000000000
         else:
             return int(mem_str)
-    except:
+    except (ValueError, TypeError):
         return 0
 
 
@@ -61,11 +54,11 @@ def _calculate_available(hard: str, used: str) -> str:
         used_num = int(re.sub(r'[^\d]', '', str(used)) or 0)
         suffix = re.sub(r'[\d]', '', str(hard))
         return f"{max(0, hard_num - used_num)}{suffix}"
-    except:
+    except (ValueError, TypeError):
         return "N/A"
 
 
-def register_cost_tools(server, non_destructive: bool):
+def register_cost_tools(server: "FastMCP", non_destructive: bool):
     """Register cost and resource optimization tools."""
 
     @server.tool(

kubectl_mcp_tool/tools/deployments.py

@@ -10,19 +10,13 @@ from ..k8s_config import (
     get_autoscaling_client,
     get_policy_client,
     _load_config_for_context,
+    _get_kubectl_context_args,
 )
 
 logger = logging.getLogger("mcp-server")
 
 
-def _get_kubectl_context_args(context: str) -> List[str]:
-    """Get kubectl context arguments if context is specified."""
-    if context:
-        return ["--context", context]
-    return []
-
-
-def register_deployment_tools(server, non_destructive: bool):
+def register_deployment_tools(server: "FastMCP", non_destructive: bool):
     """Register deployment and workload management tools."""
 
     @server.tool(

kubectl_mcp_tool/tools/diagnostics.py

@@ -4,19 +4,12 @@ from typing import Any, Dict, List, Optional
 
 from mcp.types import ToolAnnotations
 
-from ..k8s_config import get_k8s_client, get_apps_client
+from ..k8s_config import get_k8s_client, get_apps_client, _get_kubectl_context_args
 
 logger = logging.getLogger("mcp-server")
 
 
-def _get_kubectl_context_args(context: str) -> List[str]:
-    """Get kubectl context arguments if context is specified."""
-    if context:
-        return ["--context", context]
-    return []
-
-
-def register_diagnostics_tools(server, non_destructive: bool):
+def register_diagnostics_tools(server: "FastMCP", non_destructive: bool):
     """Register diagnostic and troubleshooting tools.
 
     Note: Pod-specific diagnostic tools (diagnose_pod_crash, detect_pending_pods,