feat(cli): let shared mcp configure target mistral vibe

Reuse the existing MCP configure flags where possible and map them onto Mistral Vibe's native transport and auth fields so the host works through the same CLI workflow as the other integrations.

Author: LittleCoinCoin

hatch/cli/__main__.py

@@ -585,10 +585,10 @@ def _setup_mcp_commands(subparsers):
     )
     server_type_group.add_argument(
         "--url",
-        help="Server URL for remote MCP servers (SSE transport) [hosts: all except claude-desktop, claude-code]",
+        help="Server URL for remote MCP servers (SSE/streamable transport) [hosts: all except claude-desktop, claude-code]",
     )
     server_type_group.add_argument(
-        "--http-url", help="HTTP streaming endpoint URL [hosts: gemini]"
+        "--http-url", help="HTTP streaming endpoint URL [hosts: gemini, mistral-vibe]"
     )
 
     mcp_configure_parser.add_argument(
@@ -667,12 +667,12 @@ def _setup_mcp_commands(subparsers):
     mcp_configure_parser.add_argument(
         "--startup-timeout",
         type=int,
-        help="Server startup timeout in seconds (default: 10) [hosts: codex]",
+        help="Server startup timeout in seconds (default: 10) [hosts: codex, mistral-vibe]",
     )
     mcp_configure_parser.add_argument(
         "--tool-timeout",
         type=int,
-        help="Tool execution timeout in seconds (default: 60) [hosts: codex]",
+        help="Tool execution timeout in seconds (default: 60) [hosts: codex, mistral-vibe]",
     )
     mcp_configure_parser.add_argument(
         "--enabled",
@@ -683,12 +683,35 @@ def _setup_mcp_commands(subparsers):
     mcp_configure_parser.add_argument(
         "--bearer-token-env-var",
         type=str,
-        help="Name of environment variable containing bearer token for Authorization header [hosts: codex]",
+        help="Name of environment variable containing bearer token for Authorization header [hosts: codex, mistral-vibe]",
     )
     mcp_configure_parser.add_argument(
         "--env-header",
         action="append",
-        help="HTTP header from environment variable in KEY=ENV_VAR_NAME format [hosts: codex]",
+        help="HTTP header from environment variable in KEY=ENV_VAR_NAME format [hosts: codex, mistral-vibe]",
+    )
+
+    # Mistral Vibe-specific arguments
+    mcp_configure_parser.add_argument(
+        "--prompt", help="Per-server prompt override [hosts: mistral-vibe]"
+    )
+    mcp_configure_parser.add_argument(
+        "--sampling-enabled",
+        action="store_true",
+        default=None,
+        help="Enable model sampling for tool calls [hosts: mistral-vibe]",
+    )
+    mcp_configure_parser.add_argument(
+        "--api-key-env",
+        help="Environment variable containing API key for remote auth [hosts: mistral-vibe]",
+    )
+    mcp_configure_parser.add_argument(
+        "--api-key-header",
+        help="HTTP header name used for API key injection [hosts: mistral-vibe]",
+    )
+    mcp_configure_parser.add_argument(
+        "--api-key-format",
+        help="Formatting template for API key header values [hosts: mistral-vibe]",
     )
 
     mcp_configure_parser.add_argument(

hatch/cli/cli_mcp.py

@@ -13,6 +13,7 @@
     - codex: OpenAI Codex
     - lm-studio: LM Studio
     - gemini: Google Gemini
+    - mistral-vibe: Mistral Vibe CLI
 
 Command Groups:
     Discovery:
@@ -71,6 +72,72 @@
 )
 
 
+def _apply_mistral_vibe_cli_mappings(
+    config_data: dict,
+    *,
+    command: Optional[str],
+    url: Optional[str],
+    http_url: Optional[str],
+    bearer_token_env_var: Optional[str],
+    env_header: Optional[list],
+    api_key_env: Optional[str],
+    api_key_header: Optional[str],
+    api_key_format: Optional[str],
+) -> dict:
+    """Map generic CLI flags to Mistral Vibe's host-native MCP fields."""
+    result = dict(config_data)
+    result.pop("cwd", None)
+
+    if command is not None:
+        result["transport"] = "stdio"
+    elif http_url is not None:
+        result.pop("httpUrl", None)
+        result["url"] = http_url
+        result["transport"] = "http"
+    elif url is not None:
+        result["transport"] = "streamable-http"
+
+    if env_header and len(env_header) > 1:
+        raise ValidationError(
+            "mistral-vibe supports at most one --env-header mapping",
+            field="--env-header",
+            suggestion=(
+                "Use a single KEY=ENV_VAR pair or the dedicated --api-key-* flags"
+            ),
+        )
+
+    mapped_api_key_env = api_key_env
+    mapped_api_key_header = api_key_header
+    mapped_api_key_format = api_key_format
+
+    if env_header:
+        header_name, env_var_name = env_header[0].split("=", 1)
+        if mapped_api_key_header is None:
+            mapped_api_key_header = header_name
+        if mapped_api_key_env is None:
+            mapped_api_key_env = env_var_name
+
+    if bearer_token_env_var is not None:
+        if mapped_api_key_env is None:
+            mapped_api_key_env = bearer_token_env_var
+        if mapped_api_key_header is None:
+            mapped_api_key_header = "Authorization"
+        if mapped_api_key_format is None:
+            mapped_api_key_format = "Bearer {api_key}"
+
+    if mapped_api_key_env is not None:
+        result["api_key_env"] = mapped_api_key_env
+    if mapped_api_key_header is not None:
+        result["api_key_header"] = mapped_api_key_header
+    if mapped_api_key_format is not None:
+        result["api_key_format"] = mapped_api_key_format
+
+    result.pop("bearer_token_env_var", None)
+    result.pop("env_http_headers", None)
+
+    return result
+
+
 def handle_mcp_discover_hosts(args: Namespace) -> int:
     """Handle 'hatch mcp discover hosts' command.
 
@@ -1493,6 +1560,11 @@ def handle_mcp_configure(args: Namespace) -> int:
         startup_timeout: Optional[int] = getattr(args, "startup_timeout", None)
         tool_timeout: Optional[int] = getattr(args, "tool_timeout", None)
         enabled: Optional[bool] = getattr(args, "enabled", None)
+        prompt: Optional[str] = getattr(args, "prompt", None)
+        sampling_enabled: Optional[bool] = getattr(args, "sampling_enabled", None)
+        api_key_env: Optional[str] = getattr(args, "api_key_env", None)
+        api_key_header: Optional[str] = getattr(args, "api_key_header", None)
+        api_key_format: Optional[str] = getattr(args, "api_key_format", None)
         bearer_token_env_var: Optional[str] = getattr(
             args, "bearer_token_env_var", None
         )
@@ -1604,7 +1676,7 @@ def handle_mcp_configure(args: Namespace) -> int:
             config_data["timeout"] = timeout
         if trust:
             config_data["trust"] = trust
-        if cwd is not None:
+        if cwd is not None and host_type != MCPHostType.MISTRAL_VIBE:
             config_data["cwd"] = cwd
         if http_url is not None:
             config_data["httpUrl"] = http_url
@@ -1636,11 +1708,21 @@ def handle_mcp_configure(args: Namespace) -> int:
             config_data["startup_timeout_sec"] = startup_timeout
         if tool_timeout is not None:
             config_data["tool_timeout_sec"] = tool_timeout
+        if prompt is not None:
+            config_data["prompt"] = prompt
+        if sampling_enabled is not None:
+            config_data["sampling_enabled"] = sampling_enabled
+        if api_key_env is not None:
+            config_data["api_key_env"] = api_key_env
+        if api_key_header is not None:
+            config_data["api_key_header"] = api_key_header
+        if api_key_format is not None:
+            config_data["api_key_format"] = api_key_format
         if enabled is not None:
             config_data["enabled"] = enabled
-        if bearer_token_env_var is not None:
+        if bearer_token_env_var is not None and host_type != MCPHostType.MISTRAL_VIBE:
             config_data["bearer_token_env_var"] = bearer_token_env_var
-        if env_header is not None:
+        if env_header is not None and host_type != MCPHostType.MISTRAL_VIBE:
             env_http_headers = {}
             for header_spec in env_header:
                 if "=" in header_spec:
@@ -1649,6 +1731,19 @@ def handle_mcp_configure(args: Namespace) -> int:
             if env_http_headers:
                 config_data["env_http_headers"] = env_http_headers
 
+        if host_type == MCPHostType.MISTRAL_VIBE:
+            config_data = _apply_mistral_vibe_cli_mappings(
+                config_data,
+                command=command,
+                url=url,
+                http_url=http_url,
+                bearer_token_env_var=bearer_token_env_var,
+                env_header=env_header,
+                api_key_env=api_key_env,
+                api_key_header=api_key_header,
+                api_key_format=api_key_format,
+            )
+
         # Partial update merge logic
         if is_update:
             existing_data = existing_config.model_dump(
@@ -1661,6 +1756,7 @@ def handle_mcp_configure(args: Namespace) -> int:
                 existing_data.pop("command", None)
                 existing_data.pop("args", None)
                 existing_data.pop("type", None)
+                existing_data.pop("transport", None)
 
             if command is not None and (
                 existing_config.url is not None
@@ -1670,6 +1766,10 @@ def handle_mcp_configure(args: Namespace) -> int:
                 existing_data.pop("httpUrl", None)
                 existing_data.pop("headers", None)
                 existing_data.pop("type", None)
+                existing_data.pop("transport", None)
+                existing_data.pop("api_key_env", None)
+                existing_data.pop("api_key_header", None)
+                existing_data.pop("api_key_format", None)
 
             merged_data = {**existing_data, **config_data}
             config_data = merged_data