From 0ad8f73812f05259c0bf7b8beedb058ab1940b68 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 22 Aug 2026 12:22:13 +0800
Subject: [PATCH] fix(ci): use canonical agent imports in tests

---
 tests/test_agent_graph_cache.py            | 3 ++-
 tests/test_agent_side_effect_boundaries.py | 2 +-
 tests/test_agent_subagents.py              | 7 ++++++-
 tests/test_agent_tool_timeouts.py          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_agent_graph_cache.py b/tests/test_agent_graph_cache.py
index 9be67c165..1e89a4283 100644
--- a/tests/test_agent_graph_cache.py
+++ b/tests/test_agent_graph_cache.py
@@ -8,9 +8,10 @@ from unittest.mock import AsyncMock, patch
 import pytest
 from langchain_core.messages import AIMessage, HumanMessage
 
-from app.agent import MoviePilotAgent, ReplyMode, _CompiledAgentBundle
+from app.agent.contracts import ReplyMode
 from app.agent.mcp import AgentMcpToolSpec
 from app.agent.middleware.policy import AgentPolicyMiddleware
+from app.agent.orchestrator import MoviePilotAgent, _CompiledAgentBundle
 from app.agent.tools.catalog import (
     ToolCatalogSnapshot,
     ToolIdentityAmbiguousError,
diff --git a/tests/test_agent_side_effect_boundaries.py b/tests/test_agent_side_effect_boundaries.py
index 0f8927fbb..0ff7194a8 100644
--- a/tests/test_agent_side_effect_boundaries.py
+++ b/tests/test_agent_side_effect_boundaries.py
@@ -14,7 +14,7 @@ from langchain_core.messages import ToolMessage
 from app.agent.middleware.policy import AgentPolicyMiddleware
 from app.agent.middleware.subagents import SubAgentTaskControlMiddleware
 from app.agent.orchestrator import MoviePilotAgent
-from app.agent.policy import (
+from app.agent.policy.contracts import (
     AuthSource,
     PrincipalType,
     ToolOrigin,
diff --git a/tests/test_agent_subagents.py b/tests/test_agent_subagents.py
index c26009877..450848c71 100644
--- a/tests/test_agent_subagents.py
+++ b/tests/test_agent_subagents.py
@@ -15,7 +15,12 @@ from app.agent.middleware.subagents import (
     SubAgentTaskControlMiddleware,
     create_subagent_middlewares,
 )
-from app.agent.policy import AuthSource, PrincipalType, ToolOrigin, ToolPolicyContext
+from app.agent.policy.contracts import (
+    AuthSource,
+    PrincipalType,
+    ToolOrigin,
+    ToolPolicyContext,
+)
 from app.agent.tools.tags import ToolTag
 
 
diff --git a/tests/test_agent_tool_timeouts.py b/tests/test_agent_tool_timeouts.py
index 553968f74..18dae839d 100644
--- a/tests/test_agent_tool_timeouts.py
+++ b/tests/test_agent_tool_timeouts.py
@@ -150,7 +150,7 @@ def test_shutdown_blocking_executors_cancels_queued_workers_and_is_idempotent():
 
 def test_create_agent_config_uses_llm_max_iterations():
     """Agent 执行配置应把 LLM_MAX_ITERATIONS 传给 LangGraph recursion_limit。"""
-    from app.agent import MoviePilotAgent
+    from app.agent.orchestrator import MoviePilotAgent
     from langchain_core.messages import AIMessage
 
     class _FakeGraphState: