From 7c9f84811dd31fa9f9c5aa160ee29455673857c8 Mon Sep 17 00:00:00 2001 From: Fnu Abdullah Date: Fri, 19 Jun 2026 05:17:13 -0500 Subject: [PATCH 1/3] Disable Windows glob expansion for CLI args --- src/google/adk/cli/cli_tools_click.py | 11 ++++++++++- tests/unittests/cli/utils/test_cli_tools_click.py | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py index 4ddf7a140ae..569f5216823 100644 --- a/src/google/adk/cli/cli_tools_click.py +++ b/src/google/adk/cli/cli_tools_click.py @@ -46,6 +46,12 @@ case_sensitive=False, ) +class _NoWindowsGlobExpansionGroup(click.Group): + """Click group that disables Windows glob expansion for CLI arguments.""" + + def main(self, *args, **kwargs): + kwargs.setdefault("windows_expand_args", False) + return super().main(*args, **kwargs) def _logging_options(): """Decorator to add logging options to click commands.""" @@ -235,7 +241,10 @@ def _warn_if_with_ui(with_ui: bool) -> None: click.secho(f"WARNING: {_ADK_WEB_WARNING}", fg="yellow", err=True) -@click.group(context_settings={"max_content_width": 240}) +@click.group( + cls=_NoWindowsGlobExpansionGroup, + context_settings={"max_content_width": 240}, +) @click.version_option(version.__version__) def main(): """Agent Development Kit CLI tools.""" diff --git a/tests/unittests/cli/utils/test_cli_tools_click.py b/tests/unittests/cli/utils/test_cli_tools_click.py index 6a1a7dcb9a0..3e55b851c78 100644 --- a/tests/unittests/cli/utils/test_cli_tools_click.py +++ b/tests/unittests/cli/utils/test_cli_tools_click.py @@ -88,6 +88,14 @@ def _mute_click(request, monkeypatch: pytest.MonkeyPatch) -> None: # monkeypatch.setattr(click, "secho", lambda *a, **k: None) +def test_main_disables_click_windows_glob_expansion() -> None: + """Verifies the ADK CLI disables Click's Windows glob expansion.""" + with mock.patch.object(click.Group, "main", return_value=None) as mock_main: + cli_tools_click.main.main(args=["web", ".", "--allow_origins", "*"]) + + assert mock_main.call_args.kwargs["windows_expand_args"] is False + + # validate_exclusive def test_validate_exclusive_allows_single() -> None: """Providing exactly one exclusive option should pass.""" From 6f5618a63e971d23639436eda691179157bb3720 Mon Sep 17 00:00:00 2001 From: Fnu Abdullah Date: Thu, 25 Jun 2026 02:46:29 -0500 Subject: [PATCH 2/3] Fix Windows glob expansion typing --- src/google/adk/cli/cli_tools_click.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py index 569f5216823..e07dc64a7eb 100644 --- a/src/google/adk/cli/cli_tools_click.py +++ b/src/google/adk/cli/cli_tools_click.py @@ -46,6 +46,7 @@ case_sensitive=False, ) + class _NoWindowsGlobExpansionGroup(click.Group): """Click group that disables Windows glob expansion for CLI arguments.""" @@ -53,6 +54,7 @@ def main(self, *args, **kwargs): kwargs.setdefault("windows_expand_args", False) return super().main(*args, **kwargs) + def _logging_options(): """Decorator to add logging options to click commands.""" From a92e98680f98fa47acbf9afec327051b7d8867ca Mon Sep 17 00:00:00 2001 From: Fnu Abdullah Date: Thu, 25 Jun 2026 03:04:07 -0500 Subject: [PATCH 3/3] Improve typing for Windows Click glob expansion --- src/google/adk/cli/cli_tools_click.py | 38 ++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py index a820098d447..0b601a3efc8 100644 --- a/src/google/adk/cli/cli_tools_click.py +++ b/src/google/adk/cli/cli_tools_click.py @@ -26,6 +26,8 @@ import sys import tempfile import textwrap +from typing import Any +from typing import cast import click from click.core import ParameterSource @@ -46,11 +48,13 @@ case_sensitive=False, ) +_ClickGroup = cast(type[Any], click.Group) -class _NoWindowsGlobExpansionGroup(click.Group): + +class _NoWindowsGlobExpansionGroup(_ClickGroup): """Click group that disables Windows glob expansion for CLI arguments.""" - def main(self, *args, **kwargs): + def main(self, *args: Any, **kwargs: Any) -> Any: kwargs.setdefault("windows_expand_args", False) return super().main(*args, **kwargs) @@ -2011,6 +2015,7 @@ def cli_api_server( "cloud_run", context_settings={ "allow_extra_args": True, + "allow_interspersed_args": False, }, ) @click.option( @@ -2187,7 +2192,34 @@ def cli_deploy_cloud_run( _warn_if_with_ui(with_ui) - gcloud_args = ctx.args + # Parse arguments to separate gcloud args (after --) from regular args + gcloud_args = [] + if "--" in ctx.args: + separator_index = ctx.args.index("--") + gcloud_args = ctx.args[separator_index + 1 :] + regular_args = ctx.args[:separator_index] + + # If there are regular args before --, that's an error + if regular_args: + click.secho( + "Error: Unexpected arguments after agent path and before '--':" + f" {' '.join(regular_args)}. \nOnly arguments after '--' are passed" + " to gcloud.", + fg="red", + err=True, + ) + ctx.exit(2) + else: + # No -- separator, treat all args as an error to enforce the new behavior + if ctx.args: + click.secho( + f"Error: Unexpected arguments: {' '.join(ctx.args)}. \nUse '--' to" + " separate gcloud arguments, e.g.: adk deploy cloud_run [options]" + " agent_path -- --min-instances=2", + fg="red", + err=True, + ) + ctx.exit(2) try: from . import cli_deploy