fix: Add "gcloud config unset project" command to express mode flow

If the user created an express mode project but has a different gcloud project set, we should help them unset it so that they doesn't run into permissions errors / the express mode one gets used.

Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 897783336

Author: wukath

src/google/adk/cli/cli_create.py

@@ -378,6 +378,27 @@ def _handle_login_with_google() -> (
             f"Express Mode project created: {project_id}",
             fg="green",
         )
+        current_proj = _get_gcp_project_from_gcloud()
+        if current_proj and current_proj != project_id:
+          click.secho(
+              "Warning: Your default gcloud project is set to"
+              f" '{current_proj}'. This might conflict with or override your"
+              f" Express Mode project '{project_id}'. We recommend"
+              " unsetting it.",
+              fg="yellow",
+          )
+          if click.confirm("Run 'gcloud config unset project'?", default=True):
+            try:
+              subprocess.run(
+                  ["gcloud", "config", "unset", "project"],
+                  check=True,
+                  capture_output=True,
+              )
+              click.secho("Unset default gcloud project.", fg="green")
+            except Exception:
+              click.secho(
+                  "Failed to unset project. Please do it manually.", fg="red"
+              )
         return api_key, project_id, region
 
     click.secho(_NOT_ELIGIBLE_MSG, fg="red")

tests/unittests/cli/utils/test_cli_create.py

@@ -417,6 +417,52 @@ def test_handle_login_with_google_option_2(
   assert region == "us-central1"
 
 
+def test_handle_login_with_google_option_2_unset_project(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+  """User selects 2, goes through express sign up, and unsets existing gcloud project."""
+  monkeypatch.setattr(gcp_utils, "check_adc", lambda: True)
+  monkeypatch.setattr(gcp_utils, "retrieve_express_project", lambda: None)
+  monkeypatch.setattr(gcp_utils, "list_gcp_projects", lambda limit: [])
+  monkeypatch.setattr(gcp_utils, "check_express_eligibility", lambda: True)
+
+  confirms = iter([True, True])
+  monkeypatch.setattr(click, "confirm", lambda *a, **k: next(confirms))
+
+  prompts = iter(["2", "1"])
+  monkeypatch.setattr(click, "prompt", lambda *a, **k: next(prompts))
+
+  monkeypatch.setattr(
+      gcp_utils,
+      "sign_up_express",
+      lambda location="us-central1": {
+          "api_key": "new-key",
+          "project_id": "new-proj",
+          "region": location,
+      },
+  )
+
+  monkeypatch.setattr(
+      cli_create, "_get_gcp_project_from_gcloud", lambda: "old-proj"
+  )
+
+  called = {}
+
+  def fake_run(cmd, **kwargs):
+    if cmd == ["gcloud", "config", "unset", "project"]:
+      called["unset"] = True
+      return subprocess.CompletedProcess(args=cmd, returncode=0)
+    raise ValueError(f"Unexpected command: {cmd}")
+
+  monkeypatch.setattr(subprocess, "run", fake_run)
+
+  api_key, proj, region = cli_create._handle_login_with_google()
+  assert api_key == "new-key"
+  assert proj == "new-proj"
+  assert region == "us-central1"
+  assert called.get("unset") is True
+
+
 def test_handle_login_with_google_option_3(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None: