test(e2e): stabilize Agent v2 external runtime checks (#38493)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

api/controllers/common/agent_app_parameters.py

@@ -32,7 +32,9 @@ def get_published_agent_app_feature_dict_and_user_input_form(
     )
     if agent is None:
         raise AgentAppGeneratorError("Agent App has no bound Agent")
-    if not agent.active_config_snapshot_id or not agent.active_config_is_published:
+    # active_config_is_published means the draft has no unpublished edits; the public app
+    # can still read parameters from the active snapshot while a newer draft is pending.
+    if not agent.active_config_snapshot_id:
         raise AgentAppNotPublishedError("Agent has not been published")
 
     snapshot = db.session.scalar(

api/core/app/apps/agent_app/app_generator.py

@@ -611,7 +611,9 @@ class AgentAppGenerator(MessageBasedAppGenerator):
                 "build_draft" if draft.draft_type == AgentConfigDraftType.DEBUG_BUILD else "draft"
             )
             return agent, draft.id, config_version_kind, agent_soul
-        if not agent.active_config_snapshot_id or not agent.active_config_is_published:
+        # active_config_is_published tracks whether the editable draft matches the active snapshot.
+        # Public runtime must keep serving the active snapshot even when unpublished draft edits exist.
+        if not agent.active_config_snapshot_id:
             raise AgentAppNotPublishedError("Agent has not been published")
         _, snapshot, agent_soul = self._resolve_agent_by_id(
             tenant_id=app_model.tenant_id,

api/tests/unit_tests/controllers/common/test_agent_app_parameters.py

@@ -85,15 +85,13 @@ def test_published_agent_app_parameters_requires_existing_active_agent(monkeypat
 
 
 @pytest.mark.parametrize(
-    ("active_config_snapshot_id", "active_config_is_published"),
+    "active_config_is_published",
     [
-        (None, True),
-        ("snapshot-1", False),
+        True,
+        False,
     ],
 )
-def test_published_agent_app_parameters_requires_published_agent(
-    monkeypatch, active_config_snapshot_id, active_config_is_published
-):
+def test_published_agent_app_parameters_requires_published_agent(monkeypatch, active_config_is_published):
     app_model = SimpleNamespace(
         tenant_id="tenant-1",
         bound_agent_id="agent-1",
@@ -101,7 +99,7 @@ def test_published_agent_app_parameters_requires_published_agent(
     )
     agent = SimpleNamespace(
         id="agent-1",
-        active_config_snapshot_id=active_config_snapshot_id,
+        active_config_snapshot_id=None,
         active_config_is_published=active_config_is_published,
     )
     monkeypatch.setattr(agent_app_parameters.db.session, "scalar", lambda _: agent)
@@ -110,6 +108,27 @@ def test_published_agent_app_parameters_requires_published_agent(
         get_published_agent_app_feature_dict_and_user_input_form(app_model)
 
 
+def test_published_agent_app_parameters_allows_unpublished_draft_with_active_snapshot(monkeypatch):
+    app_model = SimpleNamespace(
+        tenant_id="tenant-1",
+        bound_agent_id="agent-1",
+        app_model_config=None,
+    )
+    agent = SimpleNamespace(
+        id="agent-1",
+        active_config_snapshot_id="snapshot-1",
+        active_config_is_published=False,
+    )
+    snapshot = SimpleNamespace(config_snapshot_dict={})
+    query_results = iter([agent, snapshot])
+    monkeypatch.setattr(agent_app_parameters.db.session, "scalar", lambda _: next(query_results))
+
+    features_dict, user_input_form = get_published_agent_app_feature_dict_and_user_input_form(app_model)
+
+    assert features_dict["file_upload"]["enabled"] is True
+    assert user_input_form == []
+
+
 def test_published_agent_app_parameters_requires_published_snapshot(monkeypatch):
     app_model = SimpleNamespace(
         tenant_id="tenant-1",

api/tests/unit_tests/core/app/apps/agent_app/test_resolve_agent.py

@@ -97,12 +97,35 @@ class TestResolveAgent:
         assert config_version_kind == "snapshot"
         assert soul.model is not None
 
-    def test_unpublished_agent_raises_before_model_resolution(self, monkeypatch: pytest.MonkeyPatch):
+    def test_unpublished_draft_still_resolves_active_snapshot(self, monkeypatch: pytest.MonkeyPatch):
         bound_agent = SimpleNamespace(
             id="agent-1",
             active_config_snapshot_id="snap-1",
             active_config_is_published=False,
         )
+        inner_agent = SimpleNamespace(id="agent-1")
+        snapshot = _snapshot()
+        _patch_session(monkeypatch, [bound_agent, inner_agent, snapshot])
+        app_model = SimpleNamespace(id="app-1", tenant_id="t1")
+
+        agent, config_id, config_version_kind, soul = AgentAppGenerator()._resolve_agent(
+            app_model,
+            invoke_from=InvokeFrom.WEB_APP,
+            draft_type=None,
+            user=SimpleNamespace(id="user-1"),
+        )  # type: ignore[arg-type]
+
+        assert agent is bound_agent
+        assert config_id == snapshot.id
+        assert config_version_kind == "snapshot"
+        assert soul.prompt.system_prompt == "You are Iris."
+
+    def test_agent_without_active_snapshot_raises_before_model_resolution(self, monkeypatch: pytest.MonkeyPatch):
+        bound_agent = SimpleNamespace(
+            id="agent-1",
+            active_config_snapshot_id=None,
+            active_config_is_published=False,
+        )
         _patch_session(monkeypatch, [bound_agent])
         app_model = SimpleNamespace(id="app-1", tenant_id="t1")