fix(cli): enable interspersed option parsing for cloud_run command

The `cloud_run` CLI command was rejecting documented debug options (e.g., `--verbosity DEBUG`, `--log_level DEBUG`) when placed after positional arguments like `AGENT`, returning `Error: Unexpected arguments: --verbosity DEBUG`.

Root Cause:
The command definition previously disabled interspersed arguments (`allow_interspersed_args=False`), forcing manual parsing of the `--` separator to pass extra arguments to `gcloud`. This manual parsing was unnecessary and over-engineered, as Click natively consumes the `--` separator and delegates extra argument collection automatically when interspersed parsing is enabled.

Solution:
1. Removed `allow_interspersed_args=False` from `context_settings` in `src/google/adk/cli/cli_tools_click.py` to allow Click's default interspersed option parsing.
2. Removed the obsolete manual `--` separator parsing logic, simplifying `gcloud_args` collection directly to `ctx.args`.

Merge #4563

Original PR by @khushi0433 (khushbu_baloch <fatimahbaloch917@gmail.com>)

Co-authored-by: Yi Liu <yiliuly@google.com>
COPYBARA_INTEGRATE_REVIEW=#4563 from khushi0433:fix-cloud-run-verbosity 72b3485
PiperOrigin-RevId: 937424567

Author: 2 people

src/google/adk/cli/cli_tools_click.py

@@ -2000,7 +2000,6 @@ def cli_api_server(
     "cloud_run",
     context_settings={
         "allow_extra_args": True,
-        "allow_interspersed_args": False,
     },
 )
 @click.option(
@@ -2177,34 +2176,7 @@ def cli_deploy_cloud_run(
 
   _warn_if_with_ui(with_ui)
 
-  # 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)
+  gcloud_args = ctx.args
 
   try:
     from . import cli_deploy

tests/unittests/cli/utils/test_cli_tools_click.py

@@ -886,14 +886,14 @@ def test_cli_deploy_cloud_run_passthrough_args(
   assert "--cpu=1" in extra_args
 
 
-def test_cli_deploy_cloud_run_rejects_args_without_separator(
+def test_cli_deploy_cloud_run_allows_empty_gcloud_args(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
-  """Args without '--' separator should be rejected with helpful error message."""
+  """No gcloud args after '--' should be allowed."""
   rec = _Recorder()
   monkeypatch.setattr("google.adk.cli.cli_deploy.to_cloud_run", rec)
 
-  agent_dir = tmp_path / "agent_no_sep"
+  agent_dir = tmp_path / "agent_empty_gcloud"
   agent_dir.mkdir()
   runner = CliRunner()
   result = runner.invoke(
@@ -906,58 +906,87 @@ def test_cli_deploy_cloud_run_rejects_args_without_separator(
           "--region",
           "us-central1",
           str(agent_dir),
-          "--labels=test-label=test",  # This should be rejected
+          "--",
+          # No gcloud args after --
       ],
   )
 
-  assert result.exit_code == 2
-  assert "Unexpected arguments:" in result.output
-  assert "Use '--' to separate gcloud arguments" in result.output
-  assert not rec.calls, "cli_deploy.to_cloud_run should not be called"
+  assert result.exit_code == 0
+  assert rec.calls, "cli_deploy.to_cloud_run must be invoked"
+
+  # Check that extra_gcloud_args is empty
+  called_kwargs = rec.calls[0][1]
+  extra_args = called_kwargs.get("extra_gcloud_args")
+  assert extra_args == ()
 
 
-def test_cli_deploy_cloud_run_rejects_args_before_separator(
+def test_cli_deploy_cloud_run_interspersed_options(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
-  """Args before '--' separator should be rejected."""
+  """Options placed after the positional argument should be parsed correctly."""
   rec = _Recorder()
   monkeypatch.setattr("google.adk.cli.cli_deploy.to_cloud_run", rec)
 
-  agent_dir = tmp_path / "agent_before_sep"
+  agent_dir = tmp_path / "agent_interspersed"
   agent_dir.mkdir()
   runner = CliRunner()
   result = runner.invoke(
       cli_tools_click.main,
       [
           "deploy",
           "cloud_run",
+          str(agent_dir),
           "--project",
           "test-project",
           "--region",
           "us-central1",
+      ],
+  )
+
+  assert result.exit_code == 0
+  assert rec.calls, "cli_deploy.to_cloud_run must be invoked"
+
+  called_kwargs = rec.calls[0][1]
+  assert called_kwargs.get("project") == "test-project"
+  assert called_kwargs.get("region") == "us-central1"
+
+
+def test_cli_deploy_cloud_run_rejects_unknown_option_before_separator(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+  """Unknown option placed before '--' separator should be rejected by Click."""
+  rec = _Recorder()
+  monkeypatch.setattr("google.adk.cli.cli_deploy.to_cloud_run", rec)
+
+  agent_dir = tmp_path / "agent_bad_order"
+  agent_dir.mkdir()
+  runner = CliRunner()
+  result = runner.invoke(
+      cli_tools_click.main,
+      [
+          "deploy",
+          "cloud_run",
+          "--project",
+          "test-project",
           str(agent_dir),
-          "unexpected_arg",  # This should be rejected
-          "--",
           "--labels=test-label=test",
+          "--",
       ],
   )
 
   assert result.exit_code == 2
-  assert (
-      "Unexpected arguments after agent path and before '--':" in result.output
-  )
-  assert "unexpected_arg" in result.output
+  assert "No such option" in result.output
   assert not rec.calls, "cli_deploy.to_cloud_run should not be called"
 
 
-def test_cli_deploy_cloud_run_allows_empty_gcloud_args(
+def test_cli_deploy_cloud_run_forwards_extra_positional_arg(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
-  """No gcloud args after '--' should be allowed."""
+  """Extra positional argument before '--' is forwarded to the deployment runner."""
   rec = _Recorder()
   monkeypatch.setattr("google.adk.cli.cli_deploy.to_cloud_run", rec)
 
-  agent_dir = tmp_path / "agent_empty_gcloud"
+  agent_dir = tmp_path / "agent_extra_pos"
   agent_dir.mkdir()
   runner = CliRunner()
   result = runner.invoke(
@@ -967,21 +996,16 @@ def test_cli_deploy_cloud_run_allows_empty_gcloud_args(
           "cloud_run",
           "--project",
           "test-project",
-          "--region",
-          "us-central1",
           str(agent_dir),
+          "unexpected_arg",
           "--",
-          # No gcloud args after --
+          "--labels=test-label=test",
       ],
   )
 
   assert result.exit_code == 0
-  assert rec.calls, "cli_deploy.to_cloud_run must be invoked"
-
-  # Check that extra_gcloud_args is empty
-  called_kwargs = rec.calls[0][1]
-  extra_args = called_kwargs.get("extra_gcloud_args")
-  assert extra_args == ()
+  extra_args = rec.calls[0][1].get("extra_gcloud_args")
+  assert extra_args == ("unexpected_arg", "--labels=test-label=test")
 
 
 # cli deploy agent_engine