Merge branch 'user/priyansh/updateBIforAksDPP' of https://github.com/priyansh17/azure-cli-extensions into user/priyansh/updateBIforAksDPP

Author: choudharypr-microsoft

src/aks-agent/HISTORY.rst

@@ -11,16 +11,21 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+
+1.0.0b3
++++++++
+* Disable aks-mcp by default, offer --aks-mcp flag to enable it.
 * Don't print version check at bottom toolbar
 
+
 1.0.0b2
 +++++++
 
 * Add MCP integration for `az aks agent` with aks-mcp binary management and local server lifecycle (download, version validation, start/stop, health checks).
 * Introduce dual-mode operation: MCP mode (enhanced) and Traditional mode (built-in toolsets), with mode-specific system prompts.
 * Implement smart toolset refresh strategy with persisted mode state to avoid unnecessary refresh on repeated runs.
 * Add `--no-aks-mcp` flag to force Traditional mode when desired.
-* Add `az aks agent status` command to display MCP binary availability/version, server health, and overall mode/readiness.
+* Add `az aks agent --status` command to display MCP binary availability/version, server health, and overall mode/readiness.
 * Add structured error handling with user-friendly messages and actionable suggestions for MCP/binary/server/config errors.
 * Port and adapt comprehensive unit tests covering binary manager, MCP manager, configuration generation/validation, status models/collection, error handling, user feedback, parameters, smart refresh, MCP integration, and status command.
 

src/aks-agent/README.rst

@@ -18,6 +18,7 @@ Key capabilities
 - Configurable via a JSON/YAML config file provided with --config-file.
 - Control echo and tool output visibility with --no-echo-request and --show-tool-output.
 - Refresh the available toolsets with --refresh-toolsets.
+- Stay in traditional toolset mode by default, or opt in to aks-mcp integration with ``--aks-mcp`` when you need the enhanced capabilities.
 
 Prerequisites
 -------------
@@ -63,6 +64,15 @@ Run in non-interactive batch mode
 
     az aks agent "Diagnose networking issues" --no-interactive --max-steps 15 --model azure/my-gpt4.1-deployment
 
+Opt in to MCP mode
+------------------
+
+Traditional toolsets remain the default. Enable the aks-mcp integration when you want the enhanced toolsets by passing ``--aks-mcp``. You can return to traditional mode on a subsequent run with ``--no-aks-mcp``.
+
+.. code-block:: bash
+
+    az aks agent --aks-mcp "Check node health with MCP" --name MyManagedCluster --resource-group MyResourceGroup --model azure/my-gpt4.1-deployment
+
 Using a configuration file
 --------------------------
 

src/aks-agent/azext_aks_agent/_help.py

@@ -58,9 +58,9 @@
         - name: --status
           type: bool
           short-summary: Show AKS agent configuration and status information.
-        - name: --no-aks-mcp
+        - name: --aks-mcp
           type: bool
-          short-summary: Disable AKS MCP integration and use traditional toolsets.
+          short-summary: Enable AKS MCP integration for enhanced capabilities. Traditional mode is the default.
 
     examples:
         - name: Ask about pod issues in the cluster with Azure OpenAI

src/aks-agent/azext_aks_agent/_params.py

@@ -7,6 +7,7 @@
 import os.path
 
 from azure.cli.core.api import get_config_dir
+from azure.cli.core.commands.parameters import get_three_state_flag
 
 from azext_aks_agent._consts import CONST_AGENT_CONFIG_FILE_NAME
 
@@ -86,8 +87,16 @@ def load_arguments(self, _):
             help="Show AKS agent configuration and status information.",
         )
         c.argument(
-            "no_aks_mcp",
-            options_list=["--no-aks-mcp"],
-            help="Disable AKS MCP integration and use traditional toolsets.",
-            action="store_true",
+            "use_aks_mcp",
+            options_list=["--aks-mcp"],
+            default=False,
+            arg_type=get_three_state_flag(
+                positive_label="Enable AKS MCP integration",
+                negative_label="Disable AKS MCP integration",
+            ),
+            help=(
+                "Enable AKS MCP integration for enhanced capabilities. "
+                "Traditional mode is the default. Use --aks-mcp to enable MCP mode, or "
+                "--no-aks-mcp to explicitly disable it."
+            ),
         )

src/aks-agent/azext_aks_agent/agent/agent.py

@@ -126,7 +126,7 @@ def aks_agent(
     no_echo_request,
     show_tool_output,
     refresh_toolsets,
-    no_aks_mcp=False,
+    use_aks_mcp=False,
 ):
     """
     Interact with the AKS agent using a prompt or piped input.
@@ -147,8 +147,8 @@ def aks_agent(
     :type show_tool_output: bool
     :param refresh_toolsets: Refresh the toolsets status.
     :type refresh_toolsets: bool
-    :param no_aks_mcp: Disable AKS MCP integration and use traditional toolsets.
-    :type no_aks_mcp: bool
+    :param use_aks_mcp: Enable AKS MCP integration and use enhanced toolsets.
+    :type use_aks_mcp: bool
     """
 
     with CLITelemetryClient():
@@ -177,7 +177,7 @@ def aks_agent(
                 interactive = False
 
         # Determine MCP mode and smart refresh logic
-        use_aks_mcp = not no_aks_mcp
+        use_aks_mcp = bool(use_aks_mcp)
         current_mode = "mcp" if use_aks_mcp else "traditional"
         smart_refresh = _should_refresh_toolsets(current_mode, refresh_toolsets)
 
@@ -293,7 +293,7 @@ def _initialize_mcp_manager(verbose: bool = False):
             [
                 "Ensure all required dependencies are installed",
                 "Try reinstalling the aks-preview extension",
-                "Use --no-aks-mcp flag to disable MCP integration"
+                "Use --aks-mcp flag to enable MCP integration"
             ]
         )
 

src/aks-agent/azext_aks_agent/agent/binary_manager.py

@@ -454,7 +454,7 @@ async def download_binary(
                     "PLATFORM_UNSUPPORTED",
                     [
                         "Check if your platform is supported by the aks-mcp project",
-                        "Try using --no-aks-mcp to disable MCP integration",
+                        "Run without --aks-mcp to stay in traditional mode",
                         f"Manually install the binary from {self.GITHUB_RELEASES_URL} if available"
                     ]
                 )

src/aks-agent/azext_aks_agent/agent/error_handler.py

@@ -34,7 +34,7 @@ class MCPError(AgentError):
 
     def __init__(self, message: str, error_code: str = None, suggestions: List[str] = None):
         default_suggestions = [
-            "Try running with --no-aks-mcp to use traditional mode",
+            "Try running without --aks-mcp to stay in traditional mode",
             "Check your internet connection for MCP binary download",
             "Verify that port 8003 is available for MCP server"
         ]

src/aks-agent/azext_aks_agent/agent/mcp_manager.py

@@ -109,7 +109,7 @@ async def start_server(self) -> bool:
                     "The MCP binary should be automatically downloaded",
                     "Check your internet connection for binary download",
                     "Try running the command again to retry download",
-                    "Use --no-aks-mcp to disable MCP integration"
+                    "Run without --aks-mcp to stay in traditional mode"
                 ]
             )
 

src/aks-agent/azext_aks_agent/agent/status_models.py

@@ -242,7 +242,7 @@ def get_recommendations(self) -> List[str]:
         # Traditional mode specific recommendations
         elif self.config.is_traditional_mode:
             if self.mcp_binary.ready:
-                recommendations.append("Consider using MCP mode for enhanced capabilities (remove --no-aks-mcp)")
+                recommendations.append("Consider using MCP mode for enhanced capabilities (run with --aks-mcp)")
 
         # General recommendations
         if not self.config.config_valid:

src/aks-agent/azext_aks_agent/custom.py

@@ -28,7 +28,7 @@ def aks_agent(
     show_tool_output=False,
     refresh_toolsets=False,
     status=False,
-    no_aks_mcp=False,
+    use_aks_mcp=False,
 ):
     # If only status is requested, display and return early
     if status:
@@ -47,7 +47,7 @@ def aks_agent(
         no_echo_request,
         show_tool_output,
         refresh_toolsets,
-        no_aks_mcp,
+        use_aks_mcp=use_aks_mcp,
     )
 
 
@@ -237,7 +237,7 @@ def _get_recommendations(status_info):
         if binary_info.get("available"):
             recommendations.append(
                 "Consider using MCP mode for enhanced capabilities by running 'az aks agent' "
-                "(remove --no-aks-mcp if used)"
+                "(run again with --aks-mcp to switch modes)"
             )
         else:
             recommendations.append("✅ AKS agent is ready in traditional mode")