Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor: migrate agent models to TypeBase (#40816)
Asuka Minatoa101bbb305d5
diff --git a/api/models/agent.py b/api/models/agent.pyindex d610680729c..3fcec656360 100644--- a/api/models/agent.py+++ b/api/models/agent.py@@ -11,7 +11,7 @@ from libs.datetime_utils import naive_utc_nowfrom libs.uuid_utils import uuidv7from .agent_config_entities import AgentSoulConfig, WorkflowNodeJobConfig-from .base import Base, DefaultFieldsMixin+from .base import DefaultFieldsDCMixin, TypeBasefrom .types import EnumText, JSONModelColumn, LongText, StringUUID@@ -149,7 +149,35 @@ class AgentConfigVersionKind(StrEnum):BUILD_DRAFT = "build_draft"-class Agent(DefaultFieldsMixin, Base):+class AgentDefaultFieldsDCMixin(DefaultFieldsDCMixin, kw_only=True):+ """Dataclass defaults that retain the established explicit-ID constructor contract for agent models."""++ __abstract__ = True++ id: Mapped[str] = mapped_column( # type: ignore[override]+ StringUUID,+ primary_key=True,+ insert_default=lambda: str(uuidv7()),+ default_factory=lambda: str(uuidv7()),+ )+ created_at: Mapped[datetime] = mapped_column( # type: ignore[override]+ DateTime,+ nullable=False,+ insert_default=naive_utc_now,+ default_factory=naive_utc_now,+ server_default=func.current_timestamp(),+ )+ updated_at: Mapped[datetime] = mapped_column( # type: ignore[override]+ DateTime,+ nullable=False,+ insert_default=naive_utc_now,+ default_factory=naive_utc_now,+ server_default=func.current_timestamp(),+ onupdate=func.current_timestamp(),+ )+++class Agent(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Agent Soul and source lineage; ``AgentWorkspaceBinding.id`` identifies each materialized participant."""__tablename__ = "agents"@@ -176,30 +204,34 @@ class Agent(DefaultFieldsMixin, Base):name: Mapped[str] = mapped_column(String(255), nullable=False)description: Mapped[str] = mapped_column(LongText, nullable=False, default="")role: Mapped[str] = mapped_column(String(255), nullable=False, default="")- icon_type: Mapped[AgentIconType | None] = mapped_column(EnumText(AgentIconType, length=32), nullable=True)+ icon_type: Mapped[AgentIconType | None] = mapped_column(+ EnumText(AgentIconType, length=32), nullable=True, default=None+ )icon: Mapped[str | None] = mapped_column(String(255),nullable=True,+ default=None,comment="Icon payload interpreted by icon_type: emoji character, image file id, or external URL.",)- icon_background: Mapped[str | None] = mapped_column(String(255), nullable=True)+ icon_background: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)agent_kind: Mapped[AgentKind] = mapped_column(EnumText(AgentKind, length=32), nullable=False, default=AgentKind.DIFY_AGENT)scope: Mapped[AgentScope] = mapped_column(EnumText(AgentScope, length=32), nullable=False)source: Mapped[AgentSource] = mapped_column(EnumText(AgentSource, length=32), nullable=False)- app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)backing_app_id: Mapped[str | None] = mapped_column(StringUUID,nullable=True,+ default=None,comment=("Runtime Agent App used for chat/log/monitoring. For workflow-only agents, ""app_id remains the parent workflow app id and this points to the hidden backing app."),)- workflow_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- workflow_node_id: Mapped[str | None] = mapped_column(String(255), nullable=True)- active_config_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ workflow_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ workflow_node_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)+ active_config_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)active_config_has_model: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, default=False, server_default=sa.false())@@ -220,14 +252,15 @@ class Agent(DefaultFieldsMixin, Base):String(255),sa.Computed("CASE WHEN scope = 'roster' AND status = 'active' THEN name ELSE NULL END"),nullable=True,+ init=False,)- created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- archived_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- archived_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ archived_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ archived_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)-class AgentHomeSnapshot(Base):+class AgentHomeSnapshot(TypeBase, kw_only=True):"""Append-only mapping from one Agent-owned Home identity to its backend ref.Product tables reference ``id``. ``snapshot_ref`` remains an opaque@@ -243,7 +276,11 @@ class AgentHomeSnapshot(Base):Index("agent_home_snapshot_status_retired_idx", "status", "retired_at"),)- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuidv7()))+ id: Mapped[str] = mapped_column(+ StringUUID,+ insert_default=lambda: str(uuidv7()),+ default_factory=lambda: str(uuidv7()),+ )tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)agent_id: Mapped[str] = mapped_column(StringUUID, nullable=False)snapshot_ref: Mapped[str] = mapped_column(String(255), nullable=False)@@ -253,11 +290,17 @@ class AgentHomeSnapshot(Base):default=AgentWorkingResourceStatus.ACTIVE,server_default=AgentWorkingResourceStatus.ACTIVE.value,)- retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)- created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())+ retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)+ created_at: Mapped[datetime] = mapped_column(+ DateTime,+ nullable=False,+ insert_default=naive_utc_now,+ default_factory=naive_utc_now,+ server_default=func.current_timestamp(),+ )-class AgentDebugConversation(DefaultFieldsMixin, Base):+class AgentDebugConversation(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Current console Conversation pointer for one account and draft surface.This row owns no Binding or runtime. A Preview Conversation holds its@@ -292,7 +335,7 @@ class AgentDebugConversation(DefaultFieldsMixin, Base):conversation_id: Mapped[str] = mapped_column(StringUUID, nullable=False)-class AgentConfigDraft(DefaultFieldsMixin, Base):+class AgentConfigDraft(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Editable Agent Soul draft separated from immutable published snapshots.A DEBUG_BUILD draft owns its materialized participant through@@ -316,14 +359,14 @@ class AgentConfigDraft(DefaultFieldsMixin, Base):tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)agent_id: Mapped[str] = mapped_column(StringUUID, nullable=False)draft_type: Mapped[AgentConfigDraftType] = mapped_column(EnumText(AgentConfigDraftType, length=32), nullable=False)- account_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ account_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)draft_owner_key: Mapped[str] = mapped_column(String(255), nullable=False, default="")- base_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ base_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)config_snapshot: Mapped[Any] = mapped_column(JSONModelColumn(AgentSoulConfig), nullable=False)- created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)@propertydef config_snapshot_dict(self) -> dict[str, Any]:@@ -336,7 +379,7 @@ class AgentConfigDraft(DefaultFieldsMixin, Base):return dict(self.config_snapshot)-class AgentConfigSnapshot(DefaultFieldsMixin, Base):+class AgentConfigSnapshot(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Immutable Agent Soul snapshot.``config_snapshot`` stores ``AgentSoulConfig`` as JSON-backed ``LongText``.@@ -356,10 +399,10 @@ class AgentConfigSnapshot(DefaultFieldsMixin, Base):agent_id: Mapped[str] = mapped_column(StringUUID, nullable=False)version: Mapped[int] = mapped_column(sa.Integer, nullable=False)config_snapshot: Mapped[Any] = mapped_column(JSONModelColumn(AgentSoulConfig), nullable=False)- home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- summary: Mapped[str | None] = mapped_column(LongText, nullable=True)- version_note: Mapped[str | None] = mapped_column(LongText, nullable=True)- created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ summary: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)+ version_note: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)@propertydef config_snapshot_dict(self) -> dict[str, Any]:@@ -372,7 +415,7 @@ class AgentConfigSnapshot(DefaultFieldsMixin, Base):return dict(self.config_snapshot)-class AgentConfigRevision(Base):+class AgentConfigRevision(TypeBase, kw_only=True):"""Audit edge for every Agent Soul save operation.Revisions link immutable Agent Soul snapshots instead of duplicating the@@ -396,27 +439,33 @@ class AgentConfigRevision(Base):),)- id: Mapped[str] = mapped_column(StringUUID, primary_key=True, default=lambda: str(uuidv7()))+ id: Mapped[str] = mapped_column(+ StringUUID,+ primary_key=True,+ insert_default=lambda: str(uuidv7()),+ default_factory=lambda: str(uuidv7()),+ )tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)agent_id: Mapped[str] = mapped_column(StringUUID, nullable=False)- previous_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- current_snapshot_id: Mapped[str] = mapped_column(StringUUID, nullable=False)+ previous_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ current_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=False)revision: Mapped[int] = mapped_column(sa.Integer, nullable=False)operation: Mapped[AgentConfigRevisionOperation] = mapped_column(EnumText(AgentConfigRevisionOperation, length=64), nullable=False)- summary: Mapped[str | None] = mapped_column(LongText, nullable=True)- version_note: Mapped[str | None] = mapped_column(LongText, nullable=True)- created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ summary: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)+ version_note: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)created_at: Mapped[datetime] = mapped_column(DateTime,nullable=False,- default=naive_utc_now,+ insert_default=naive_utc_now,+ default_factory=naive_utc_now,server_default=func.current_timestamp(),)-class WorkflowAgentNodeBinding(DefaultFieldsMixin, Base):+class WorkflowAgentNodeBinding(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Binding between one workflow node and one Agent config snapshot.``node_job_config`` stores Workflow Node Job JSON only. Agent Soul belongs@@ -456,11 +505,11 @@ class WorkflowAgentNodeBinding(DefaultFieldsMixin, Base):binding_type: Mapped[WorkflowAgentBindingType] = mapped_column(EnumText(WorkflowAgentBindingType, length=32), nullable=False)- agent_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- current_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ agent_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ current_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)node_job_config: Mapped[Any] = mapped_column(JSONModelColumn(WorkflowNodeJobConfig), nullable=False)- created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)@propertydef node_job_config_dict(self) -> dict[str, Any]:@@ -473,7 +522,7 @@ class WorkflowAgentNodeBinding(DefaultFieldsMixin, Base):return dict(self.node_job_config)-class AgentWorkspace(DefaultFieldsMixin, Base):+class AgentWorkspace(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""Mutable Workspace owned by one product scope, independent of Agents."""__tablename__ = "agent_workspaces"@@ -508,10 +557,10 @@ class AgentWorkspace(DefaultFieldsMixin, Base):server_default=AgentWorkingResourceStatus.ACTIVE.value,)active_guard: Mapped[int | None] = mapped_column(sa.SmallInteger, nullable=True, default=1, server_default="1")- retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)+ retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)-class AgentWorkspaceBinding(DefaultFieldsMixin, Base):+class AgentWorkspaceBinding(AgentDefaultFieldsDCMixin, TypeBase, kw_only=True):"""One materialized Agent participant and session attached to a Workspace.All resource IDs are logical associations rather than database foreign@@ -532,19 +581,19 @@ class AgentWorkspaceBinding(DefaultFieldsMixin, Base):app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)workspace_id: Mapped[str] = mapped_column(StringUUID, nullable=False)agent_id: Mapped[str] = mapped_column(StringUUID, nullable=False)- base_home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)+ base_home_snapshot_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)agent_config_version_id: Mapped[str] = mapped_column(StringUUID, nullable=False)agent_config_version_kind: Mapped[AgentConfigVersionKind] = mapped_column(EnumText(AgentConfigVersionKind, length=32), nullable=False)backend_binding_ref: Mapped[str] = mapped_column(String(255), nullable=False)- session_snapshot: Mapped[str | None] = mapped_column(LongText, nullable=True)+ session_snapshot: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)status: Mapped[AgentWorkingResourceStatus] = mapped_column(EnumText(AgentWorkingResourceStatus, length=32),nullable=False,default=AgentWorkingResourceStatus.ACTIVE,server_default=AgentWorkingResourceStatus.ACTIVE.value,)- retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)- pending_form_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)- pending_tool_call_id: Mapped[str | None] = mapped_column(String(255), nullable=True)+ retired_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)+ pending_form_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)+ pending_tool_call_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)diff --git a/api/services/agent/composer_service.py b/api/services/agent/composer_service.pyindex d56bf52073a..ede6785fbdb 100644--- a/api/services/agent/composer_service.py+++ b/api/services/agent/composer_service.py@@ -802,6 +802,7 @@ class AgentComposerService:if retired_binding_id is None:raise AgentBuildSandboxNotFoundError()build_draft.agent_workspace_binding_id = None+ config_snapshot = AgentSoulConfig.model_validate(normal_draft.config_snapshot_dict)if build_draft is None:build_draft = AgentConfigDraft(tenant_id=tenant_id,@@ -810,11 +811,13 @@ class AgentComposerService:account_id=account_id,draft_owner_key=account_id,created_by=account_id,+ config_snapshot=config_snapshot,)session.add(build_draft)+ else:+ build_draft.config_snapshot = config_snapshotbuild_draft.base_snapshot_id = normal_draft.base_snapshot_idbuild_draft.home_snapshot_id = normal_draft.home_snapshot_id- build_draft.config_snapshot = AgentSoulConfig.model_validate(normal_draft.config_snapshot_dict)build_draft.updated_by = account_idsession.flush()return cls._serialize_build_draft_state(build_draft), retired_binding_id@@ -1665,6 +1668,7 @@ class AgentComposerService:workflow_id=workflow_id,workflow_version=_DRAFT_WORKFLOW_VERSION,node_id=node_id,+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,node_job_config=WorkflowNodeJobConfig(),created_by=account_id,)diff --git a/api/services/agent/roster_service.py b/api/services/agent/roster_service.pyindex 9dee3a7a53a..7fabecd1636 100644--- a/api/services/agent/roster_service.py+++ b/api/services/agent/roster_service.py@@ -1472,6 +1472,7 @@ class AgentRosterService:).limit(1))+ config_snapshot = AgentSoulConfig.model_validate(version.config_snapshot_dict)if draft is None:draft = AgentConfigDraft(tenant_id=tenant_id,@@ -1481,11 +1482,13 @@ class AgentRosterService:draft_owner_key="",created_by=account_id,home_snapshot_id=version.home_snapshot_id,+ config_snapshot=config_snapshot,)self._session.add(draft)+ else:+ draft.config_snapshot = config_snapshotdraft.base_snapshot_id = version.iddraft.home_snapshot_id = version.home_snapshot_id- draft.config_snapshot = AgentSoulConfig.model_validate(version.config_snapshot_dict)draft.updated_by = account_idagent.active_config_is_published = version.id == agent.active_config_snapshot_idagent.updated_by = account_iddiff --git a/api/services/agent/workflow_publish_service.py b/api/services/agent/workflow_publish_service.pyindex d3b01e3efbe..755547fd2ac 100644--- a/api/services/agent/workflow_publish_service.py+++ b/api/services/agent/workflow_publish_service.py@@ -390,6 +390,7 @@ class WorkflowAgentPublishService:workflow_id=draft_workflow.id,workflow_version=cls._DRAFT_WORKFLOW_VERSION,node_id=node_id,+ binding_type=resolved_binding_type,node_job_config=node_job_config,created_by=account_id,)diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.pyindex 4f46d43a209..8223bb17e3d 100644--- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py+++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py@@ -408,6 +408,10 @@ def test_agent_app_list_and_create_use_agent_route("load_app_backing_agents_by_app_id",lambda _self, **kwargs: {"app-list": Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,id="agent-list",app_id="app-list",backing_app_id=None,@@ -420,6 +424,10 @@ def test_agent_app_list_and_create_use_agent_route(roster_controller.AgentRosterService,"get_app_backing_agent",lambda _self, **kwargs: Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,id="agent-created",app_id="app-created",backing_app_id=None,@@ -1028,6 +1036,10 @@ def test_agent_app_update_allows_empty_role(roster_controller.AgentRosterService,"get_app_backing_agent",lambda _self, **kwargs: Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,id=agent_id,app_id="app-1",backing_app_id=None,@@ -2070,7 +2082,13 @@ def test_resolve_current_user_agent_debug_conversation_uses_agent_or_backing_appdef get_app_backing_agent(self, **kwargs: object) -> object:calls.append({"get_app_backing_agent": kwargs})- return Agent(id="backing-agent")+ return Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,+ id="backing-agent",+ )monkeypatch.setattr(completion_controller, "AgentRosterService", FakeRosterService)explicit_id = completion_controller._resolve_current_user_agent_debug_conversation_id(diff --git a/api/tests/unit_tests/controllers/inner_api/app/test_app.py b/api/tests/unit_tests/controllers/inner_api/app/test_app.pyindex a8099744e15..9c60274c8bf 100644--- a/api/tests/unit_tests/controllers/inner_api/app/test_app.py+++ b/api/tests/unit_tests/controllers/inner_api/app/test_app.py@@ -112,14 +112,23 @@ def _app(tenant_id: str, name: str, *, mode: AppMode = AppMode.WORKFLOW, createdreturn app-def _agent(tenant_id: str, *, scope: AgentScope, status: AgentStatus = AgentStatus.ACTIVE, **kwargs: object) -> Agent:+def _agent(+ tenant_id: str,+ *,+ scope: AgentScope,+ status: AgentStatus = AgentStatus.ACTIVE,+ app_id: str | None = None,+ backing_app_id: str | None = None,+) -> Agent:+ """Create a test Agent. None leaves the corresponding App association unset."""return Agent(tenant_id=tenant_id,name=f"agent-{uuid4()}",scope=scope,source=AgentSource.AGENT_APP if scope == AgentScope.ROSTER else AgentSource.WORKFLOW,status=status,- **kwargs,+ app_id=app_id,+ backing_app_id=backing_app_id,)@@ -138,12 +147,24 @@ def _workflow(app: App, *, version: str, created_by: str, entry_node_type: str =)-def _snapshot(agent: Agent, version: int, created_at: datetime, **kwargs: object) -> AgentConfigSnapshot:- snapshot = AgentConfigSnapshot(- tenant_id=agent.tenant_id, agent_id=agent.id, version=version, config_snapshot={}, **kwargs+def _snapshot(+ agent: Agent,+ version: int,+ created_at: datetime,+ *,+ version_note: str | None = None,+ created_by: str | None = None,+) -> AgentConfigSnapshot:+ """Create a test snapshot. None leaves the version note or creator unspecified."""+ return AgentConfigSnapshot(+ tenant_id=agent.tenant_id,+ agent_id=agent.id,+ version=version,+ config_snapshot={},+ created_at=created_at,+ version_note=version_note,+ created_by=created_by,)- snapshot.created_at = created_at- return snapshotdef _revision(diff --git a/api/tests/unit_tests/controllers/openapi/test_node_types.py b/api/tests/unit_tests/controllers/openapi/test_node_types.pyindex 88a32512f03..377c5091f25 100644--- a/api/tests/unit_tests/controllers/openapi/test_node_types.py+++ b/api/tests/unit_tests/controllers/openapi/test_node_types.py@@ -64,8 +64,10 @@ def test_http_request_default_body_carries_an_empty_data_list(assert response.default_config["retry_config"] == graphon_default["retry_config"]-def test_keys_the_default_already_has_are_kept(describe: Callable[[str], NodeTypeDetailResponse]) -> None:- graphon_default = HttpRequestNode.get_default_config()+def test_keys_the_default_already_has_are_kept(+ describe: Callable[[str], NodeTypeDetailResponse], sqlite_session_factory: sessionmaker[Session]+) -> None:+ graphon_default = WorkflowService(sqlite_session_factory).get_default_block_config(BuiltinNodeTypes.HTTP_REQUEST)graphon_timeout = cast(Mapping[str, object], cast(Mapping[str, object], graphon_default["config"])["timeout"])response = describe(BuiltinNodeTypes.HTTP_REQUEST)diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.pyindex 283c46d974f..2bfe8b23a71 100644--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py@@ -118,7 +118,9 @@ class FakeVariablePool:class FakeBindingResolver(WorkflowAgentBindingResolver):def __init__(self):self.calls: list[dict[str, object]] = []- self.agent = Agent(id="agent-1", tenant_id="tenant-1", name="Agent")+ self.agent = Agent(+ scope=AgentScope.ROSTER, source=AgentSource.ROSTER, id="agent-1", tenant_id="tenant-1", name="Agent"+ )self.snapshot = AgentConfigSnapshot(id="snapshot-1",tenant_id="tenant-1",@@ -135,6 +137,8 @@ class FakeBindingResolver(WorkflowAgentBindingResolver):),)self.binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.pyindex afaeadd5e3d..5651da46785 100644--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py@@ -29,7 +29,14 @@ from core.workflow.nodes.agent_v2.runtime_request_builder import ()from graphon.file import File, FileTransferMethod, FileTypefrom graphon.variables.segments import ArrayFileSegment, FileSegment, StringSegment-from models.agent import Agent, AgentConfigSnapshot, WorkflowAgentNodeBinding+from models.agent import (+ Agent,+ AgentConfigSnapshot,+ AgentScope,+ AgentSource,+ WorkflowAgentBindingType,+ WorkflowAgentNodeBinding,+)from models.agent_config_entities import (AgentSoulConfig,AgentSoulModelConfig,@@ -170,7 +177,7 @@ class FakeVariablePool:def _context() -> WorkflowAgentRuntimeBuildContext:- agent = Agent(id="agent-1", tenant_id="tenant-1", name="Agent")+ agent = Agent(scope=AgentScope.ROSTER, source=AgentSource.ROSTER, id="agent-1", tenant_id="tenant-1", name="Agent")snapshot = AgentConfigSnapshot(id="snapshot-1",tenant_id="tenant-1",@@ -187,6 +194,8 @@ def _context() -> WorkflowAgentRuntimeBuildContext:),)binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",@@ -409,6 +418,8 @@ def test_builds_workflow_run_request_with_file_output_schema_and_reserved_metada),)binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",@@ -977,6 +988,8 @@ def test_requires_agent_soul_model_config():def test_missing_previous_node_output_fails_request_build():context = _context()binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",@@ -1001,6 +1014,8 @@ def test_missing_previous_node_output_fails_request_build():def test_invalid_previous_node_output_ref_fails_request_build():context = _context()binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",@@ -1025,6 +1040,8 @@ def test_invalid_previous_node_output_ref_fails_request_build():def test_empty_declared_outputs_omits_structured_output_layer():context = _context()binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",@@ -1044,6 +1061,8 @@ def test_empty_declared_outputs_omits_structured_output_layer():def test_array_output_emits_typed_items_per_array_item():context = _context()binding = WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,id="binding-1",tenant_id="tenant-1",app_id="app-1",diff --git a/api/tests/unit_tests/models/test_agent.py b/api/tests/unit_tests/models/test_agent.pyindex fb2e834e8ac..d061c8d1874 100644--- a/api/tests/unit_tests/models/test_agent.py+++ b/api/tests/unit_tests/models/test_agent.py@@ -1,5 +1,6 @@import json-from typing import cast+from collections.abc import Callable+from typing import Protocol, castimport pytestimport sqlalchemy as sa@@ -12,18 +13,132 @@ from models.agent import (AgentConfigRevision,AgentConfigRevisionOperation,AgentConfigSnapshot,+ AgentConfigVersionKind,+ AgentDebugConversation,+ AgentHomeSnapshot,AgentIconType,AgentKind,AgentScope,AgentSource,AgentStatus,+ AgentWorkspace,+ AgentWorkspaceBinding,+ AgentWorkspaceOwnerType,WorkflowAgentBindingType,WorkflowAgentNodeBinding,)-from models.agent_config_entities import AgentSoulConfig+from models.agent_config_entities import AgentSoulConfig, WorkflowNodeJobConfig+from models.base import Base, TypeBasefrom models.types import JSONModelColumn, LongText+class _AgentModel(Protocol):+ id: str+++ ("model", "required_values"),+ [+ (+ Agent,+ {+ "tenant_id": "tenant-1",+ "name": "Agent",+ "scope": AgentScope.ROSTER,+ "source": AgentSource.ROSTER,+ },+ ),+ (AgentHomeSnapshot, {"tenant_id": "tenant-1", "agent_id": "agent-1", "snapshot_ref": "backend-home"}),+ (+ AgentDebugConversation,+ {+ "tenant_id": "tenant-1",+ "agent_id": "agent-1",+ "app_id": "app-1",+ "account_id": "account-1",+ "conversation_id": "conversation-1",+ },+ ),+ (+ AgentConfigDraft,+ {+ "tenant_id": "tenant-1",+ "agent_id": "agent-1",+ "draft_type": AgentConfigDraftType.DRAFT,+ "config_snapshot": AgentSoulConfig(),+ },+ ),+ (+ AgentConfigSnapshot,+ {"tenant_id": "tenant-1", "agent_id": "agent-1", "version": 1, "config_snapshot": AgentSoulConfig()},+ ),+ (+ AgentConfigRevision,+ {+ "tenant_id": "tenant-1",+ "agent_id": "agent-1",+ "current_snapshot_id": "snapshot-1",+ "revision": 1,+ "operation": AgentConfigRevisionOperation.CREATE_VERSION,+ },+ ),+ (+ WorkflowAgentNodeBinding,+ {+ "tenant_id": "tenant-1",+ "app_id": "app-1",+ "workflow_id": "workflow-1",+ "workflow_version": "draft",+ "node_id": "node-1",+ "binding_type": WorkflowAgentBindingType.ROSTER_AGENT,+ "node_job_config": WorkflowNodeJobConfig(),+ },+ ),+ (+ AgentWorkspace,+ {+ "tenant_id": "tenant-1",+ "app_id": "app-1",+ "owner_type": AgentWorkspaceOwnerType.CONVERSATION,+ "owner_id": "conversation-1",+ "owner_scope_key": "root",+ "backend_workspace_ref": "workspace-ref",+ },+ ),+ (+ AgentWorkspaceBinding,+ {+ "tenant_id": "tenant-1",+ "app_id": "app-1",+ "workspace_id": "workspace-1",+ "agent_id": "agent-1",+ "agent_config_version_id": "snapshot-1",+ "agent_config_version_kind": AgentConfigVersionKind.SNAPSHOT,+ "backend_binding_ref": "binding-ref",+ },+ ),+ ],+)+def test_agent_models_require_fields_and_generate_ids(+ model: Callable[..., _AgentModel], required_values: dict[str, object]+) -> None:+ typebase_models = {mapper.class_ for mapper in TypeBase.registry.mappers}+ base_models = {mapper.class_ for mapper in Base.registry.mappers}++ assert model in typebase_models+ assert model not in base_models+ first = model(**required_values)+ second = model(**required_values)+ assert first.id+ assert second.id != first.id+ assert model(id="explicit-id", **required_values).id == "explicit-id"++ for missing_field in required_values:+ incomplete_values = {key: value for key, value in required_values.items() if key != missing_field}+ with pytest.raises(TypeError, match=missing_field):+ model(**incomplete_values)++def test_agent_enums_match_prd_boundaries():assert AgentKind.DIFY_AGENT.value == "dify_agent"assert AgentIconType.EMOJI.value == "emoji"@@ -166,6 +281,7 @@ def test_workflow_binding_stores_node_job_config_separately_from_agent_soul():"declared_outputs": [{"name": "questions", "type": "array"}],}binding = WorkflowAgentNodeBinding(+ workflow_version="draft",tenant_id="tenant-1",app_id="app-1",workflow_id="workflow-1",diff --git a/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py b/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.pyindex 7da6834b3cf..fc4e14c07fb 100644--- a/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py+++ b/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py@@ -9,7 +9,14 @@ from sqlalchemy.orm import Session, sessionmakerfrom extensions.ext_redis import RedisClientWrapperfrom models.account import Tenant, TenantStatus-from models.agent import Agent, AgentConfigRevision, AgentConfigRevisionOperation, AgentConfigSnapshot+from models.agent import (+ Agent,+ AgentConfigRevision,+ AgentConfigRevisionOperation,+ AgentConfigSnapshot,+ AgentScope,+ AgentSource,+)from models.agent_config_entities import AgentSoulConfigfrom models.enums import CustomizeTokenStrategyfrom models.model import App, AppMode, RecommendedApp, Site@@ -89,8 +96,8 @@ def test_agent_package_link_only_exposes_current_public_version(tenant_id=app.tenant_id,app_id=app.id,name="Template",- scope="roster",- source="agent_app",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,active_config_snapshot_id=version_id,active_config_is_published=False,)diff --git a/api/tests/unit_tests/repositories/test_trial_app_repository_agent.py b/api/tests/unit_tests/repositories/test_trial_app_repository_agent.pyindex 642cff15ec0..453f678a257 100644--- a/api/tests/unit_tests/repositories/test_trial_app_repository_agent.py+++ b/api/tests/unit_tests/repositories/test_trial_app_repository_agent.py@@ -3,7 +3,14 @@ from uuid import uuid4import pytestfrom sqlalchemy.orm import Session, sessionmaker-from models.agent import Agent, AgentConfigRevision, AgentConfigRevisionOperation, AgentConfigSnapshot+from models.agent import (+ Agent,+ AgentConfigRevision,+ AgentConfigRevisionOperation,+ AgentConfigSnapshot,+ AgentScope,+ AgentSource,+)from models.model import App, AppMode, TrialAppfrom repositories.trial_app_repository import TrialAppRepository@@ -41,8 +48,8 @@ def test_agent_trial_requires_a_visible_existing_snapshot(tenant_id=tenant_id,app_id=app_id,name="Agent",- scope="roster",- source="agent_app",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,active_config_snapshot_id=snapshot_id,active_config_is_published=False,),diff --git a/api/tests/unit_tests/services/agent/test_agent_services.py b/api/tests/unit_tests/services/agent/test_agent_services.pyindex 0131ad97d57..80e4c4ff2f5 100644--- a/api/tests/unit_tests/services/agent/test_agent_services.py+++ b/api/tests/unit_tests/services/agent/test_agent_services.py@@ -5,6 +5,7 @@ from types import SimpleNamespacefrom unittest.mock import MagicMock, callimport pytest+from pytest_mock import MockerFixturefrom sqlalchemy import event, selectfrom sqlalchemy.exc import IntegrityErrorfrom sqlalchemy.orm import Session@@ -257,6 +258,12 @@ def test_load_workflow_composer_returns_empty_state(monkeypatch: pytest.MonkeyPadef test_load_workflow_composer_serializes_existing_binding(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),agent_id="agent-1",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,current_snapshot_id="version-1",@@ -289,6 +296,12 @@ def test_load_workflow_composer_serializes_existing_binding(monkeypatch: pytest.def test_load_workflow_composer_uses_roster_preview_snapshot(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),agent_id="agent-1",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,current_snapshot_id="binding-version",@@ -327,6 +340,9 @@ def test_load_workflow_composer_uses_roster_preview_snapshot(monkeypatch: pytestdef test_load_workflow_composer_uses_inline_preview_snapshot(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ workflow_version="draft",+ node_job_config=WorkflowNodeJobConfig(),agent_id="inline-agent-1",binding_type=WorkflowAgentBindingType.INLINE_AGENT,current_snapshot_id="inline-version-1",@@ -335,6 +351,9 @@ def test_load_workflow_composer_uses_inline_preview_snapshot(monkeypatch: pytestnode_id="node-1",)agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ source=AgentSource.WORKFLOW,id="inline-agent-1",scope=AgentScope.WORKFLOW_ONLY,app_id="app-1",@@ -382,8 +401,22 @@ def test_workflow_inline_debug_conversation_seed(monkeypatch: pytest.MonkeyPatchmonkeypatch.setattr(roster_service, "AgentRosterService", FakeRosterService)- binding = WorkflowAgentNodeBinding(binding_type=WorkflowAgentBindingType.INLINE_AGENT)- agent = Agent(id="inline-agent-1", scope=AgentScope.WORKFLOW_ONLY)+ binding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),+ binding_type=WorkflowAgentBindingType.INLINE_AGENT,+ )+ agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ source=AgentSource.WORKFLOW,+ id="inline-agent-1",+ scope=AgentScope.WORKFLOW_ONLY,+ )debug_conversation_id = AgentComposerService._workflow_inline_debug_conversation_id(session=session,@@ -415,8 +448,18 @@ def test_workflow_inline_debug_conversation_seed_skips_non_inline(AgentComposerService._workflow_inline_debug_conversation_id(session=session,tenant_id="tenant-1",- binding=WorkflowAgentNodeBinding(binding_type=WorkflowAgentBindingType.ROSTER_AGENT),- agent=Agent(id="agent-1", scope=AgentScope.ROSTER),+ binding=WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,+ ),+ agent=Agent(+ tenant_id="tenant-1", name="Agent", source=AgentSource.ROSTER, id="agent-1", scope=AgentScope.ROSTER+ ),account_id="account-1",)is None@@ -425,8 +468,22 @@ def test_workflow_inline_debug_conversation_seed_skips_non_inline(AgentComposerService._workflow_inline_debug_conversation_id(session=session,tenant_id="tenant-1",- binding=WorkflowAgentNodeBinding(binding_type=WorkflowAgentBindingType.INLINE_AGENT),- agent=Agent(id="inline-agent-1", scope=AgentScope.WORKFLOW_ONLY),+ binding=WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),+ binding_type=WorkflowAgentBindingType.INLINE_AGENT,+ ),+ agent=Agent(+ tenant_id="tenant-1",+ name="Agent",+ source=AgentSource.WORKFLOW,+ id="inline-agent-1",+ scope=AgentScope.WORKFLOW_ONLY,+ ),account_id=None,)is None@@ -463,6 +520,12 @@ def test_load_workflow_composer_rejects_preview_without_binding(def test_save_workflow_composer_dispatches_save_strategy(monkeypatch, strategy, helper_name, sqlite_session: Session):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),agent_id="agent-1",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,current_snapshot_id="version-1",@@ -524,10 +587,22 @@ def test_save_workflow_composer_commits_before_retiring_replaced_inline_agent(session = sqlite_sessionevents: list[str] = []old_binding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),agent_id="old-inline-agent",binding_type=WorkflowAgentBindingType.INLINE_AGENT,)new_binding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ node_job_config=WorkflowNodeJobConfig(),agent_id="new-agent",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,current_snapshot_id="version-1",@@ -641,6 +716,9 @@ def test_publish_save_strategies_run_publish_validation(strategy: ComposerSaveStdef test_save_agent_app_composer_creates_agent_when_missing(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_sessionsaved_draft = AgentConfigDraft(+ tenant_id="tenant-1",+ agent_id="agent-1",+ draft_type=AgentConfigDraftType.DRAFT,id="draft-1",home_snapshot_id="home-initial",config_snapshot=AgentSoulConfig.model_validate({"prompt": {"system_prompt": "x"}}),@@ -684,7 +762,12 @@ def test_load_agent_app_composer_exposes_draft_save_only(monkeypatch: pytest.Monagent.active_config_snapshot_id = "version-1"agent.active_config_is_published = Trueagent.backing_app_id = "app-1"- draft = AgentConfigDraft(config_snapshot=AgentSoulConfig.model_validate({"prompt": {"system_prompt": "x"}}))+ draft = AgentConfigDraft(+ tenant_id="tenant-1",+ agent_id="agent-1",+ draft_type=AgentConfigDraftType.DRAFT,+ config_snapshot=AgentSoulConfig.model_validate({"prompt": {"system_prompt": "x"}}),+ )monkeypatch.setattr(AgentComposerService, "_require_agent_app_agent", lambda **kwargs: agent)monkeypatch.setattr(AgentComposerService, "_get_agent_draft", lambda **kwargs: draft)@@ -854,14 +937,30 @@ def test_save_agent_app_composer_updates_normal_draft(monkeypatch: pytest.Monkeyagent.updated_by = Nonesession.add(agent)session.commit()- active_version = AgentConfigSnapshot(home_snapshot_id="home-initial", config_snapshot=AgentSoulConfig())+ active_version = AgentConfigSnapshot(+ tenant_id="tenant-1",+ agent_id="agent-1",+ version=1,+ home_snapshot_id="home-initial",+ config_snapshot=AgentSoulConfig(),+ )saved = {}monkeypatch.setattr(composer_service.ComposerConfigValidator, "validate_draft_save_payload", lambda payload: None)monkeypatch.setattr(AgentComposerService,"_save_agent_draft",- lambda **kwargs: saved.update(kwargs) or AgentConfigDraft(id="draft-1", home_snapshot_id="home-initial"),+ lambda **kwargs: (+ saved.update(kwargs)+ or AgentConfigDraft(+ tenant_id="tenant-1",+ agent_id="agent-1",+ draft_type=AgentConfigDraftType.DRAFT,+ config_snapshot=AgentSoulConfig(),+ id="draft-1",+ home_snapshot_id="home-initial",+ )+ ),)monkeypatch.setattr(AgentComposerService, "_get_version_if_present", lambda **_kwargs: active_version)monkeypatch.setattr(@@ -910,13 +1009,22 @@ def test_save_agent_app_composer_keeps_published_when_draft_matches_active_snaps)session.add_all([agent, revision])session.commit()- active_version = AgentConfigSnapshot(home_snapshot_id="home-initial", config_snapshot=agent_soul)+ active_version = AgentConfigSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", version=1, home_snapshot_id="home-initial", config_snapshot=agent_soul+ )monkeypatch.setattr(composer_service.ComposerConfigValidator, "validate_draft_save_payload", lambda payload: None)monkeypatch.setattr(AgentComposerService,"_save_agent_draft",- lambda **_kwargs: AgentConfigDraft(id="draft-1", home_snapshot_id="home-initial"),+ lambda **_kwargs: AgentConfigDraft(+ tenant_id="tenant-1",+ agent_id="agent-1",+ draft_type=AgentConfigDraftType.DRAFT,+ config_snapshot=AgentSoulConfig(),+ id="draft-1",+ home_snapshot_id="home-initial",+ ),)monkeypatch.setattr(AgentComposerService, "_get_version_if_present", lambda **_kwargs: active_version)monkeypatch.setattr(@@ -1147,7 +1255,7 @@ def test_repeated_publish_reuses_normal_draft_home_without_creating_resources(def test_agent_app_build_draft_checkout_and_apply_use_user_isolated_draft(- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture):session = sqlite_sessionagent = Agent(@@ -1215,8 +1323,13 @@ def test_agent_app_build_draft_checkout_and_apply_use_user_isolated_draft(source_binding_id = "binding-1"build_draft.agent_workspace_binding_id = source_binding_idsession.commit()- create_home = MagicMock(return_value=AgentHomeSnapshot(id="home-build", snapshot_ref="backend-home-build"))- monkeypatch.setattr(AgentHomeSnapshotService, "create_for_build_apply", create_home)+ create_home = mocker.patch.object(+ AgentHomeSnapshotService,+ "create_for_build_apply",+ return_value=AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", id="home-build", snapshot_ref="backend-home-build"+ ),+ )retire_binding = MagicMock()enqueue_collection = MagicMock()monkeypatch.setattr(AgentWorkspaceService, "retire_binding", retire_binding)@@ -1298,6 +1411,10 @@ def test_force_build_draft_checkout_collects_retired_binding_after_commit(config_snapshot=_agent_soul_with_model(),)binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ backend_binding_ref="backend-binding-1",agent_id=agent.id,base_home_snapshot_id="home-1",agent_config_version_id=build_draft.id,@@ -1440,6 +1557,9 @@ def test_build_apply_checkpoints_binding_updates_normal_draft_then_collects(config_snapshot=AgentSoulConfig(),)source_binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",id="binding-1",backend_binding_ref="backend-binding-1",agent_id="agent-1",@@ -1487,6 +1607,7 @@ def test_build_apply_checkpoints_binding_updates_normal_draft_then_collects(def test_build_apply_retires_normal_preview_binding_before_replacing_draft_home(monkeypatch: pytest.MonkeyPatch,sqlite_session: Session,+ mocker: MockerFixture,) -> None:session = sqlite_sessionagent = Agent(@@ -1539,6 +1660,10 @@ def test_build_apply_retires_normal_preview_binding_before_replacing_draft_home(preview_conversation.agent_workspace_binding_id = "binding-preview"empty_preview_conversation = _conversation(conversation_id="conversation-preview-empty", account_id="account-3")preview_binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ backend_binding_ref="backend-binding-1",id="binding-preview",agent_id=agent.id,base_home_snapshot_id="home-preview-old",@@ -1558,10 +1683,12 @@ def test_build_apply_retires_normal_preview_binding_before_replacing_draft_home(session.commit()lifecycle: list[str] = []event.listen(session, "after_commit", lambda _session: lifecycle.append("commit"))- monkeypatch.setattr(+ mocker.patch.object(AgentHomeSnapshotService,"create_for_build_apply",- MagicMock(return_value=AgentHomeSnapshot(id="home-applied")),+ return_value=AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", snapshot_ref="backend-home", id="home-applied"+ ),)monkeypatch.setattr(AgentComposerService, "_save_agent_draft", MagicMock(return_value=normal_draft))monkeypatch.setattr(AgentComposerService, "_agent_soul_matches_active_config", MagicMock(return_value=False))@@ -1649,6 +1776,7 @@ def test_build_apply_validates_before_resolving_or_snapshotting_sandbox(def test_build_apply_without_model_snapshots_source_sandbox_and_updates_normal_draft(monkeypatch: pytest.MonkeyPatch,sqlite_session: Session,+ mocker: MockerFixture,) -> None:session = sqlite_sessionagent = Agent(@@ -1683,11 +1811,16 @@ def test_build_apply_without_model_snapshots_source_sandbox_and_updates_normal_d)session.add_all([agent, build_draft])session.commit()- create_home = MagicMock(return_value=AgentHomeSnapshot(id="home-new", snapshot_ref="backend-home-new"))+ create_home = mocker.patch.object(+ AgentHomeSnapshotService,+ "create_for_build_apply",+ return_value=AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", id="home-new", snapshot_ref="backend-home-new"+ ),+ )validate_knowledge = MagicMock()monkeypatch.setattr(composer_service.ComposerConfigValidator, "validate_publish_payload", lambda _payload: None)monkeypatch.setattr(AgentComposerService, "validate_knowledge_datasets", validate_knowledge)- monkeypatch.setattr(AgentHomeSnapshotService, "create_for_build_apply", create_home)monkeypatch.setattr(AgentComposerService, "_save_agent_draft", lambda **_kwargs: normal_draft)monkeypatch.setattr(AgentComposerService, "_agent_soul_matches_active_config", lambda **_kwargs: False)monkeypatch.setattr(AgentWorkspaceService, "retire_binding", MagicMock())@@ -1759,7 +1892,7 @@ def test_build_apply_requires_retained_sandbox_before_creating_home(def test_build_apply_fails_when_locked_source_cannot_be_retired(- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture) -> None:session = sqlite_sessionagent = Agent(@@ -1796,10 +1929,12 @@ def test_build_apply_fails_when_locked_source_cannot_be_retired(session.commit()monkeypatch.setattr(composer_service.ComposerConfigValidator, "validate_publish_payload", lambda _payload: None)monkeypatch.setattr(AgentComposerService, "validate_knowledge_datasets", lambda **_kwargs: None)- monkeypatch.setattr(+ mocker.patch.object(AgentHomeSnapshotService,"create_for_build_apply",- MagicMock(return_value=AgentHomeSnapshot(id="home-new", snapshot_ref="backend-home-new")),+ return_value=AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", id="home-new", snapshot_ref="backend-home-new"+ ),)monkeypatch.setattr(AgentComposerService, "_save_agent_draft", MagicMock(return_value=normal_draft))monkeypatch.setattr(AgentComposerService, "_agent_soul_matches_active_config", lambda **_kwargs: False)@@ -1927,7 +2062,9 @@ def test_build_apply_commit_failure_rolls_back_and_preserves_physical_home(monkeypatch.setattr(AgentHomeSnapshotService,"create_for_build_apply",- lambda **_kwargs: AgentHomeSnapshot(id="home-new", snapshot_ref="backend-home-new"),+ lambda **_kwargs: AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", id="home-new", snapshot_ref="backend-home-new"+ ),)monkeypatch.setattr(AgentHomeSnapshotService, "delete", delete_home)monkeypatch.setattr(AgentComposerService, "_save_agent_draft", lambda **_kwargs: normal_draft)@@ -2023,6 +2160,10 @@ def test_build_discard_retires_then_commits_before_enqueue(config_snapshot=AgentSoulConfig(),)binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ backend_binding_ref="backend-binding-1",agent_id=agent.id,base_home_snapshot_id="home-1",agent_config_version_id=build_draft.id,@@ -2071,6 +2212,10 @@ def test_build_discard_commit_failure_does_not_enqueue(config_snapshot=AgentSoulConfig(),)binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ backend_binding_ref="backend-binding-1",agent_id=agent.id,base_home_snapshot_id="home-1",agent_config_version_id=build_draft.id,@@ -2197,7 +2342,7 @@ def test_load_agent_soul_for_debug_requires_existing_build_draft(sqlite_session:def test_agent_app_build_draft_apply_marks_unpublished_when_build_draft_differs(- monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture):session = sqlite_sessionagent = Agent(@@ -2250,8 +2395,13 @@ def test_agent_app_build_draft_apply_marks_unpublished_when_build_draft_differs()session.add_all([agent, build_draft, normal_draft, active_version])session.commit()- create_home = MagicMock(return_value=AgentHomeSnapshot(id="home-build", snapshot_ref="backend-home-build"))- monkeypatch.setattr(AgentHomeSnapshotService, "create_for_build_apply", create_home)+ create_home = mocker.patch.object(+ AgentHomeSnapshotService,+ "create_for_build_apply",+ return_value=AgentHomeSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", id="home-build", snapshot_ref="backend-home-build"+ ),+ )monkeypatch.setattr(AgentWorkspaceService, "retire_binding", MagicMock())monkeypatch.setattr(composer_service, "enqueue_agent_resource_collection", MagicMock())@@ -2327,6 +2477,8 @@ def test_serialize_workflow_state_changes_lock_and_save_options():session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ app_id="app-1",+ workflow_version="draft",id="binding-1",tenant_id="tenant-1",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,@@ -2337,6 +2489,7 @@ def test_serialize_workflow_state_changes_lock_and_save_options(node_job_config='{"workflow_prompt":"do work"}',)agent = Agent(+ tenant_id="tenant-1",id="agent-1",name="Analyst",description="Clarifies tenders",@@ -2348,7 +2501,13 @@ def test_serialize_workflow_state_changes_lock_and_save_options(source=AgentSource.ROSTER,status=AgentStatus.ACTIVE,)- version = AgentConfigSnapshot(id="version-1", version=1, config_snapshot='{"prompt":{"system_prompt":"x"}}')+ version = AgentConfigSnapshot(+ tenant_id="tenant-1",+ agent_id="agent-1",+ id="version-1",+ version=1,+ config_snapshot='{"prompt":{"system_prompt":"x"}}',+ )monkeypatch.setattr(AgentComposerService, "calculate_impact", lambda **kwargs: {"workflow_node_count": 1})state = AgentComposerService._serialize_workflow_state(@@ -2371,6 +2530,8 @@ def test_serialize_workflow_state_passes_user_declared_outputs_through_effective):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ app_id="app-1",+ workflow_version="draft",id="binding-1",tenant_id="tenant-1",binding_type=WorkflowAgentBindingType.ROSTER_AGENT,@@ -2383,6 +2544,7 @@ def test_serialize_workflow_state_passes_user_declared_outputs_through_effective),)agent = Agent(+ tenant_id="tenant-1",id="agent-1",name="Analyst",description="",@@ -2390,7 +2552,13 @@ def test_serialize_workflow_state_passes_user_declared_outputs_through_effectivesource=AgentSource.ROSTER,status=AgentStatus.ACTIVE,)- version = AgentConfigSnapshot(id="version-1", version=1, config_snapshot='{"prompt":{"system_prompt":"x"}}')+ version = AgentConfigSnapshot(+ tenant_id="tenant-1",+ agent_id="agent-1",+ id="version-1",+ version=1,+ config_snapshot='{"prompt":{"system_prompt":"x"}}',+ )monkeypatch.setattr(AgentComposerService, "calculate_impact", lambda **kwargs: {"workflow_node_count": 1})state = AgentComposerService._serialize_workflow_state(@@ -2410,6 +2578,8 @@ def test_serialize_workflow_state_includes_inline_debug_conversation_message_sta):session = sqlite_sessionbinding = WorkflowAgentNodeBinding(+ app_id="app-1",+ workflow_version="draft",id="binding-1",tenant_id="tenant-1",binding_type=WorkflowAgentBindingType.INLINE_AGENT,@@ -2420,6 +2590,7 @@ def test_serialize_workflow_state_includes_inline_debug_conversation_message_stanode_job_config='{"workflow_prompt":"work"}',)agent = Agent(+ tenant_id="tenant-1",id="agent-1",name="Inline Agent",description="",@@ -2428,7 +2599,13 @@ def test_serialize_workflow_state_includes_inline_debug_conversation_message_stastatus=AgentStatus.ACTIVE,backing_app_id="backing-app-1",)- version = AgentConfigSnapshot(id="version-1", version=1, config_snapshot='{"prompt":{"system_prompt":"x"}}')+ version = AgentConfigSnapshot(+ tenant_id="tenant-1",+ agent_id="agent-1",+ id="version-1",+ version=1,+ config_snapshot='{"prompt":{"system_prompt":"x"}}',+ )monkeypatch.setattr(AgentComposerService, "calculate_impact", lambda **kwargs: {"workflow_node_count": 1})monkeypatch.setattr(AgentComposerService,@@ -2456,8 +2633,17 @@ def test_serialize_workflow_state_includes_inline_debug_conversation_message_stadef test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_session- workflow_agent = Agent(id="inline-agent-1", active_config_snapshot_id="inline-version-1")+ workflow_agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.WORKFLOW_ONLY,+ source=AgentSource.WORKFLOW,+ id="inline-agent-1",+ active_config_snapshot_id="inline-version-1",+ )roster_agent = Agent(+ tenant_id="tenant-1",+ source=AgentSource.WORKFLOW,id="roster-agent-1",active_config_snapshot_id="roster-version-1",name="Roster",@@ -2496,7 +2682,9 @@ def test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.Monkmonkeypatch.setattr(AgentComposerService,"_create_config_version",- lambda **kwargs: AgentConfigSnapshot(id="new-version-1", version=2),+ lambda **kwargs: AgentConfigSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", config_snapshot=AgentSoulConfig(), id="new-version-1", version=2+ ),)payload = ComposerSavePayload.model_validate({@@ -2512,7 +2700,17 @@ def test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.Monk"icon_background": "#E0F2FE",})- existing_binding = WorkflowAgentNodeBinding(agent_id="inline-agent-1", current_snapshot_id="inline-version-1")+ existing_binding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ binding_type=WorkflowAgentBindingType.INLINE_AGENT,+ node_job_config=WorkflowNodeJobConfig(),+ agent_id="inline-agent-1",+ current_snapshot_id="inline-version-1",+ )updated_binding = AgentComposerService._save_node_job_only(session=session,@@ -2549,6 +2747,9 @@ def test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.Monktenant_id="tenant-1",account_id="account-1",binding=WorkflowAgentNodeBinding(+ workflow_version="draft",+ binding_type=WorkflowAgentBindingType.INLINE_AGENT,+ node_job_config=WorkflowNodeJobConfig(),tenant_id="tenant-1",app_id="app-1",workflow_id="workflow-1",@@ -2562,7 +2763,17 @@ def test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.Monksession=session,tenant_id="tenant-1",account_id="account-1",- binding=WorkflowAgentNodeBinding(agent_id="roster-agent-1", current_snapshot_id="source-version-1"),+ binding=WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,+ node_job_config=WorkflowNodeJobConfig(),+ agent_id="roster-agent-1",+ current_snapshot_id="source-version-1",+ ),payload=payload,)@@ -2585,6 +2796,9 @@ def test_composer_save_helpers_create_and_rebind_agents(monkeypatch: pytest.Monkdef test_node_job_only_updates_inline_agent_soul(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_sessioninline_agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ source=AgentSource.WORKFLOW,id="inline-agent-1",scope=AgentScope.WORKFLOW_ONLY,active_config_snapshot_id="inline-version-1",@@ -2787,7 +3001,14 @@ def test_node_job_only_switches_roster_binding_to_inline_agent(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):session = sqlite_session- created_agent = Agent(id="inline-agent-1", active_config_snapshot_id="inline-version-1")+ created_agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.WORKFLOW_ONLY,+ source=AgentSource.WORKFLOW,+ id="inline-agent-1",+ active_config_snapshot_id="inline-version-1",+ )captured: dict[str, object] = {}def fake_create_workflow_only_agent(**kwargs):@@ -2891,14 +3112,19 @@ def test_node_job_only_rejects_inline_binding_pointing_to_roster_agent(version=1,config_snapshot='{"prompt":{"system_prompt":"old"}}',)- next_snapshot = AgentConfigSnapshot(id="inline-version-2", tenant_id="tenant-1", agent_id="agent-1", version=2)- roster_agent = Agent(id="agent-1", scope=AgentScope.ROSTER)+ next_snapshot = AgentConfigSnapshot(+ config_snapshot=AgentSoulConfig(), id="inline-version-2", tenant_id="tenant-1", agent_id="agent-1", version=2+ )+ roster_agent = Agent(+ tenant_id="tenant-1", name="Agent", source=AgentSource.ROSTER, id="agent-1", scope=AgentScope.ROSTER+ )monkeypatch.setattr(AgentComposerService, "_require_version", lambda **kwargs: current_snapshot)monkeypatch.setattr(AgentComposerService, "_update_current_version", lambda **kwargs: next_snapshot)monkeypatch.setattr(AgentComposerService, "_require_agent", lambda **kwargs: roster_agent)binding = WorkflowAgentNodeBinding(+ node_job_config=WorkflowNodeJobConfig(),tenant_id="tenant-1",app_id="app-1",workflow_id="workflow-1",@@ -3142,6 +3368,7 @@ def test_copy_workflow_composer_from_roster_is_idempotent_when_already_inline(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session):inline_binding = WorkflowAgentNodeBinding(+ node_job_config=WorkflowNodeJobConfig(),tenant_id="tenant-1",app_id="app-1",workflow_id="workflow-1",@@ -3314,6 +3541,8 @@ def test_composer_create_agents_syncs_active_config_has_model(AgentComposerService,"_require_version",lambda **kwargs: AgentConfigSnapshot(+ version=1,+ config_snapshot=AgentSoulConfig(),id="empty-version-1",tenant_id="tenant-1",agent_id="roster-agent-1",@@ -3438,12 +3667,16 @@ def test_agent_app_draft_match_does_not_mark_create_version_as_published():agent_soul = AgentSoulConfig()agent = Agent(+ name="Agent",+ scope=AgentScope.ROSTER,id="agent-1",tenant_id="tenant-1",source=AgentSource.AGENT_APP,active_config_snapshot_id="snapshot-1",)- snapshot = AgentConfigSnapshot(config_snapshot=agent_soul, home_snapshot_id="home-1")+ snapshot = AgentConfigSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", version=1, config_snapshot=agent_soul, home_snapshot_id="home-1"+ )session = sqlite_sessionmonkeypatch.setattr(AgentComposerService, "_get_version_if_present", lambda **kwargs: snapshot)@@ -3464,12 +3697,16 @@ def test_agent_app_draft_match_marks_publish_visible_revision_as_published():agent_soul = AgentSoulConfig()agent = Agent(+ name="Agent",+ scope=AgentScope.ROSTER,id="agent-1",tenant_id="tenant-1",source=AgentSource.AGENT_APP,active_config_snapshot_id="snapshot-1",)- snapshot = AgentConfigSnapshot(config_snapshot=agent_soul, home_snapshot_id="home-1")+ snapshot = AgentConfigSnapshot(+ tenant_id="tenant-1", agent_id="agent-1", version=1, config_snapshot=agent_soul, home_snapshot_id="home-1"+ )session = sqlite_sessionsession.add(AgentConfigRevision(@@ -3579,7 +3816,17 @@ def test_composer_current_version_and_error_paths(monkeypatch: pytest.MonkeyPatc"node_job": {"workflow_prompt": "job"},})- binding = WorkflowAgentNodeBinding(agent_id="agent-1", current_snapshot_id="version-1")+ binding = WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,+ node_job_config=WorkflowNodeJobConfig(),+ agent_id="agent-1",+ current_snapshot_id="version-1",+ )version = AgentConfigSnapshot(id="version-1",tenant_id="tenant-1",@@ -3592,7 +3839,15 @@ def test_composer_current_version_and_error_paths(monkeypatch: pytest.MonkeyPatcmonkeypatch.setattr(AgentComposerService,"_require_agent",- lambda **kwargs: Agent(id="agent-1", updated_by=None, active_config_is_published=False),+ lambda **kwargs: Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.ROSTER,+ id="agent-1",+ updated_by=None,+ active_config_is_published=False,+ ),)result = AgentComposerService._save_to_current_version(session=session,@@ -4356,8 +4611,8 @@ def test_load_or_create_build_conversations_supports_runtime_backed_agents(sqlitdef test_agent_app_visible_versions_exclude_draft_saves():- agent_app = Agent(source=AgentSource.AGENT_APP)- roster_agent = Agent(source=AgentSource.ROSTER)+ agent_app = Agent(tenant_id="tenant-1", name="Agent", scope=AgentScope.ROSTER, source=AgentSource.AGENT_APP)+ roster_agent = Agent(tenant_id="tenant-1", name="Agent", scope=AgentScope.ROSTER, source=AgentSource.ROSTER)agent_app_operations = AgentRosterService._visible_version_operations(agent_app)roster_operations = AgentRosterService._visible_version_operations(roster_agent)@@ -4864,7 +5119,15 @@ class TestAgentAppBackingAgent:previous_conversation = _conversation(conversation_id="old-conversation")previous_conversation.app_id = "old-app"previous_conversation.agent_workspace_binding_id = "binding-1"- binding = AgentWorkspaceBinding(agent_id=agent.id)+ binding = AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ agent_config_version_id="snapshot-1",+ agent_config_version_kind=AgentConfigVersionKind.SNAPSHOT,+ backend_binding_ref="backend-binding-1",+ agent_id=agent.id,+ )session.add_all([agent, mapping, previous_conversation])session.commit()service = AgentRosterService(session)@@ -4902,7 +5165,7 @@ class TestAgentAppBackingAgent:)def test_reset_build_conversation_retires_build_draft_binding(- self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture):session = sqlite_sessionagent = Agent(@@ -4936,10 +5199,21 @@ class TestAgentAppBackingAgent:)session.add_all([agent, mapping, build_draft])session.commit()- get_active_binding = MagicMock(return_value=AgentWorkspaceBinding(agent_id=agent.id))+ get_active_binding = mocker.patch.object(+ AgentWorkspaceService,+ "get_active_binding",+ return_value=AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ agent_config_version_id="build-draft-1",+ agent_config_version_kind=AgentConfigVersionKind.BUILD_DRAFT,+ backend_binding_ref="backend-binding-1",+ agent_id=agent.id,+ ),+ )retire_binding = MagicMock(return_value="binding-1")enqueue_collection = MagicMock()- monkeypatch.setattr(AgentWorkspaceService, "get_active_binding", get_active_binding)monkeypatch.setattr(AgentWorkspaceService, "retire_binding", retire_binding)monkeypatch.setattr(roster_service, "enqueue_agent_resource_collection", enqueue_collection)@@ -4965,7 +5239,7 @@ class TestAgentAppBackingAgent:)def test_preview_rotation_commit_failure_rolls_back_before_enqueue(- self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture):session = sqlite_sessionagent = Agent(@@ -4996,10 +5270,18 @@ class TestAgentAppBackingAgent:"before_commit",lambda _session: (_ for _ in ()).throw(RuntimeError("commit failed")),)- monkeypatch.setattr(+ mocker.patch.object(AgentWorkspaceService,"get_active_binding",- MagicMock(return_value=AgentWorkspaceBinding(agent_id=agent.id)),+ return_value=AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ agent_config_version_id="snapshot-1",+ agent_config_version_kind=AgentConfigVersionKind.SNAPSHOT,+ backend_binding_ref="backend-binding-1",+ agent_id=agent.id,+ ),)monkeypatch.setattr(AgentWorkspaceService, "retire_binding", MagicMock(return_value="binding-1"))enqueue_collection = MagicMock()@@ -5016,7 +5298,7 @@ class TestAgentAppBackingAgent:enqueue_collection.assert_not_called()def test_build_reset_commit_failure_rolls_back_before_enqueue(- self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session+ self, monkeypatch: pytest.MonkeyPatch, sqlite_session: Session, mocker: MockerFixture):session = sqlite_sessionagent = Agent(@@ -5062,8 +5344,19 @@ class TestAgentAppBackingAgent:event.listen(session, "before_commit", fail_commit)event.listen(session, "after_rollback", rollback)- get_active_binding = MagicMock(return_value=AgentWorkspaceBinding(agent_id=agent.id))- monkeypatch.setattr(AgentWorkspaceService, "get_active_binding", get_active_binding)+ get_active_binding = mocker.patch.object(+ AgentWorkspaceService,+ "get_active_binding",+ return_value=AgentWorkspaceBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workspace_id="workspace-1",+ agent_config_version_id="build-draft-1",+ agent_config_version_kind=AgentConfigVersionKind.BUILD_DRAFT,+ backend_binding_ref="backend-binding-1",+ agent_id=agent.id,+ ),+ )retire_binding = MagicMock(side_effect=lambda **_kwargs: events.append("retire") or "binding-1")monkeypatch.setattr(AgentWorkspaceService, "retire_binding", retire_binding)enqueue_collection = MagicMock()@@ -5257,6 +5550,10 @@ class TestAgentAppBackingAgent:source_app.use_icon_as_answer_icon = Falsesource_app.tracing = Nonesource_agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,id="source-agent",role="Analyst",active_config_snapshot_id="source-snapshot",@@ -5324,6 +5621,10 @@ class TestAgentAppBackingAgent:source_app.use_icon_as_answer_icon = Falsesource_app.tracing = Nonesource_agent = Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.AGENT_APP,id="source-agent",role="Analyst",active_config_snapshot_id="source-snapshot",@@ -6205,7 +6506,9 @@ class TestWorkflowAgentDraftBindingSync:assert session.get(WorkflowAgentNodeBinding, existing_binding.id) is existing_bindingassert not session.new- def test_clones_inline_binding_for_agent_owned_by_another_node(self, monkeypatch, sqlite_session: Session):+ def test_clones_inline_binding_for_agent_owned_by_another_node(+ self, monkeypatch, sqlite_session: Session, mocker: MockerFixture+ ):session = sqlite_sessionworkflow = Workflow(id="workflow-1",@@ -6247,8 +6550,20 @@ class TestWorkflowAgentDraftBindingSync:)session.add(agent)session.commit()- clone = MagicMock(return_value=(Agent(id="cloned-agent"), "cloned-snapshot"))- monkeypatch.setattr(WorkflowAgentPublishService, "_clone_inline_graph_binding_for_node", clone)+ clone = mocker.patch.object(+ WorkflowAgentPublishService,+ "_clone_inline_graph_binding_for_node",+ return_value=(+ Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.WORKFLOW_ONLY,+ source=AgentSource.WORKFLOW,+ id="cloned-agent",+ ),+ "cloned-snapshot",+ ),+ )WorkflowAgentPublishService.sync_agent_bindings_for_draft(session=session,@@ -6859,7 +7174,13 @@ def test_save_agent_composer_allows_incomplete_knowledge_draft()session.add_all([agent, revision])session.commit()- active_version = AgentConfigSnapshot(home_snapshot_id="home-initial", config_snapshot=AgentSoulConfig())+ active_version = AgentConfigSnapshot(+ tenant_id="tenant-1",+ agent_id="agent-1",+ version=1,+ home_snapshot_id="home-initial",+ config_snapshot=AgentSoulConfig(),+ )saved = {}flushes = 0@@ -6879,7 +7200,17 @@ def test_save_agent_composer_allows_incomplete_knowledge_draft(monkeypatch.setattr(AgentComposerService,"_save_agent_draft",- lambda **kwargs: saved.update(kwargs) or AgentConfigDraft(id="draft-1", home_snapshot_id="home-initial"),+ lambda **kwargs: (+ saved.update(kwargs)+ or AgentConfigDraft(+ tenant_id="tenant-1",+ agent_id="agent-1",+ draft_type=AgentConfigDraftType.DRAFT,+ config_snapshot=AgentSoulConfig(),+ id="draft-1",+ home_snapshot_id="home-initial",+ )+ ),)monkeypatch.setattr(AgentComposerService, "_get_version_if_present", lambda **_kwargs: active_version)monkeypatch.setattr(AgentComposerService, "load_agent_composer", lambda **_kwargs: {"loaded": True})@@ -6989,7 +7320,18 @@ def test_resolve_workflow_node_agent_id_degrades_without_workflow_or_binding(monkeypatch.setattr(AgentComposerService,"_get_workflow_binding",- classmethod(lambda cls, **kwargs: WorkflowAgentNodeBinding(agent_id="agent-7")),+ classmethod(+ lambda cls, **kwargs: WorkflowAgentNodeBinding(+ tenant_id="tenant-1",+ app_id="app-1",+ workflow_id="workflow-1",+ workflow_version="draft",+ node_id="node-1",+ binding_type=WorkflowAgentBindingType.ROSTER_AGENT,+ node_job_config=WorkflowNodeJobConfig(),+ agent_id="agent-7",+ )+ ),)assert (AgentComposerService.resolve_workflow_node_agent_id(session=session, tenant_id="t", app_id="a", node_id="n")@@ -7023,7 +7365,14 @@ def test_save_as_new_agent_preserves_omitted_node_job(monkeypatch: pytest.Monkeymonkeypatch.setattr(AgentComposerService,"_create_roster_agent_for_composer",- lambda **kwargs: Agent(id="new-agent", active_config_snapshot_id="new-snapshot"),+ lambda **kwargs: Agent(+ tenant_id="tenant-1",+ name="Agent",+ scope=AgentScope.ROSTER,+ source=AgentSource.ROSTER,+ id="new-agent",+ active_config_snapshot_id="new-snapshot",+ ),)monkeypatch.setattr("services.agent.composer_service.SkillManagementService.copy_agent_bindings", lambda self, **kwargs: Nonediff --git a/api/tests/unit_tests/services/agent/test_home_snapshot_service.py b/api/tests/unit_tests/services/agent/test_home_snapshot_service.pyindex 444959aec09..97a615aee93 100644--- a/api/tests/unit_tests/services/agent/test_home_snapshot_service.py+++ b/api/tests/unit_tests/services/agent/test_home_snapshot_service.py@@ -64,7 +64,9 @@ def test_home_snapshot_client_outlasts_the_gateway_snapshot_budget(monkeypatch:def test_validate_home_snapshot_binding_accepts_default_home_without_ledger_lookup(unbound_session: Session) -> None:validate_home_snapshot_binding(session=unbound_session,- agent=Agent(id="agent-1"),+ agent=Agent(+ tenant_id="tenant-1", name="Agent", scope=AgentScope.ROSTER, source=AgentSource.ROSTER, id="agent-1"+ ),home_snapshot_id=None,)diff --git a/api/tests/unit_tests/services/agent/test_retirement_service.py b/api/tests/unit_tests/services/agent/test_retirement_service.pyindex 698f5a2a799..be71b67ab1b 100644--- a/api/tests/unit_tests/services/agent/test_retirement_service.py+++ b/api/tests/unit_tests/services/agent/test_retirement_service.py@@ -123,7 +123,10 @@ def test_retire_unowned_requires_an_exact_persisted_workflow_owner_key(if mismatched_key is not None and mismatched_key != "tenant_id":binding_key[mismatched_key] = mismatched_values[mismatched_key]binding = WorkflowAgentNodeBinding(- **binding_key,+ tenant_id=binding_key["tenant_id"],+ app_id=binding_key["app_id"],+ workflow_id=binding_key["workflow_id"],+ workflow_version=binding_key["workflow_version"],node_id="agent-node",binding_type=WorkflowAgentBindingType.INLINE_AGENT,agent_id=agent.id,diff --git a/api/tests/unit_tests/services/agent/test_workspace_service.py b/api/tests/unit_tests/services/agent/test_workspace_service.pyindex afdc4cfcd0a..8310b331500 100644--- a/api/tests/unit_tests/services/agent/test_workspace_service.py+++ b/api/tests/unit_tests/services/agent/test_workspace_service.py@@ -54,7 +54,7 @@ def _workspace(updated_at: datetime | None = None,backend_workspace_ref: str = "workspace-ref",) -> AgentWorkspace:- return AgentWorkspace(+ row = AgentWorkspace(id=workspace_id,tenant_id=tenant_id,app_id=app_id,@@ -64,8 +64,10 @@ def _workspace(backend_workspace_ref=backend_workspace_ref,status=status,active_guard=1 if status is AgentWorkingResourceStatus.ACTIVE else None,- updated_at=updated_at,)+ if updated_at is not None:+ row.updated_at = updated_at+ return rowdef _binding(@@ -79,7 +81,7 @@ def _binding(config_kind: AgentConfigVersionKind = AgentConfigVersionKind.SNAPSHOT,updated_at: datetime | None = None,) -> AgentWorkspaceBinding:- return AgentWorkspaceBinding(+ row = AgentWorkspaceBinding(id=binding_id,tenant_id=tenant_id,app_id=app_id,@@ -90,8 +92,10 @@ def _binding(agent_config_version_kind=config_kind,backend_binding_ref=f"{binding_id}-ref",status=status,- updated_at=updated_at,)+ if updated_at is not None:+ row.updated_at = updated_at+ return rowdef test_workspace_client_honors_the_configured_snapshot_timeout(monkeypatch: pytest.MonkeyPatch) -> None:diff --git a/api/tests/unit_tests/services/test_skill_management_service.py b/api/tests/unit_tests/services/test_skill_management_service.pyindex 7aa383a7a53..f7d2ca066ab 100644--- a/api/tests/unit_tests/services/test_skill_management_service.py+++ b/api/tests/unit_tests/services/test_skill_management_service.py@@ -25,6 +25,7 @@ from models.agent import (AgentConfigDraftType,AgentConfigRevision,AgentConfigSnapshot,+ AgentIconType,AgentKind,AgentScope,AgentSource,@@ -169,7 +170,7 @@ def _seed_agent() -> None:name="Skill Agent",icon="🤖",icon_background="#EEF4FF",- icon_type="emoji",+ icon_type=AgentIconType.EMOJI,scope=AgentScope.ROSTER,source=AgentSource.AGENT_APP,)@@ -1285,7 +1286,7 @@ def test_list_skill_references_resolves_agent_apps_and_inline_workflow_nodes() -name="Agent 内嵌节点 C",icon="✨",icon_background="#EEF4FF",- icon_type="emoji",+ icon_type=AgentIconType.EMOJI,scope=AgentScope.WORKFLOW_ONLY,source=AgentSource.WORKFLOW,app_id="66666666-6666-6666-6666-666666666666",