From 193cde4f2b88fc45d0d0e13ba49d9dfe6c188de9 Mon Sep 17 00:00:00 2001
From: Elia <eliasecchi@google.com>
Date: Mon, 22 Dec 2025 17:56:24 +0100
Subject: [PATCH] feat: restrict session type selection to adk_base and
 agentic_rag

Limit session type selection for cloud_run deployment to only adk_base
and agentic_rag agents. Other agents now default to in_memory sessions
with a warning if the user explicitly specifies a different session type.
---
 agent_starter_pack/cli/commands/create.py | 35 +++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/agent_starter_pack/cli/commands/create.py b/agent_starter_pack/cli/commands/create.py
index 729ceef0..f94c7c12 100644
--- a/agent_starter_pack/cli/commands/create.py
+++ b/agent_starter_pack/cli/commands/create.py
@@ -739,6 +739,9 @@ def create(
         # Check if agent requires session management
         requires_session = config.get("settings", {}).get("requires_session", False)
 
+        # Session type selection is only available for these agents on cloud_run
+        session_type_supported_agents = ("adk_base", "agentic_rag")
+
         if requires_session:
             if final_deployment == "agent_engine" and session_type:
                 console.print(
@@ -748,19 +751,27 @@ def create(
                 )
                 return
 
-            if (
-                final_deployment is not None
-                and final_deployment in ("cloud_run")
-                and not session_type
-            ):
-                if auto_approve:
-                    final_session_type = "in_memory"
-                    console.print(
-                        "Info: --session-type not specified. Defaulting to 'in_memory' in auto-approve mode.",
-                        style="yellow",
-                    )
+            if final_deployment == "cloud_run":
+                if deployment_agent_name in session_type_supported_agents:
+                    # Allow session type selection for supported agents
+                    if not session_type:
+                        if auto_approve:
+                            final_session_type = "in_memory"
+                            console.print(
+                                "Info: --session-type not specified. Defaulting to 'in_memory' in auto-approve mode.",
+                                style="yellow",
+                            )
+                        else:
+                            final_session_type = prompt_session_type_selection()
                 else:
-                    final_session_type = prompt_session_type_selection()
+                    # For unsupported agents, always use in_memory
+                    final_session_type = "in_memory"
+                    if session_type and session_type != "in_memory":
+                        console.print(
+                            f"Warning: Session type selection is only available for {', '.join(session_type_supported_agents)} agents. "
+                            "Using in-memory sessions for this agent.",
+                            style="yellow",
+                        )
         else:
             # Agents that don't require session management always use in-memory sessions
             final_session_type = "in_memory"