feat: 接通 Planner → Action → Validator

app/processor/nodes/action_node.py

@@ -1,20 +1,23 @@
-"""将简单修改需求转换为动作列表"""
+"""将简单修改或新增规划转换为动作列表"""
 
 import json
 
-from langchain_core.messages import HumanMessage, SystemMessage
 from langchain_core.exceptions import OutputParserException
+from langchain_core.messages import HumanMessage, SystemMessage
 from pydantic import BaseModel, ValidationError
 
+from app.actions.plan import assemble_plan_actions, plan_block_reason, plan_materials
 from app.clients.llm import get_llm
 from app.processor.base import BaseNode
 from app.processor.state import QueryState
 from app.prompt.action import ACTION_SYSTEM_PROMPT
-from app.schemas.actions import ActionBatch
 from app.schemas.action_validation import ActionValidationError, schema_errors
+from app.schemas.actions import ActionBatch, AddAction
 
 
 def can_generate_actions(state: QueryState) -> bool:
+    if state.get("screen_plan") is not None:
+        return plan_block_reason(state) is None
     requirement = state["requirement"]
     scope = state["change_scope"]
     # 当前只接入三种已有组件操作，后续能力逐步扩展
@@ -42,6 +45,18 @@ class ActionNode(BaseNode):
 
     async def process(self, state: QueryState) -> QueryState:
         updated_state: QueryState = state.copy()
+        if state.get("screen_plan") is not None and (
+            reason := plan_block_reason(state)
+        ):
+            updated_state.update(
+                actions=None,
+                validation_passed=False,
+                validation_errors=[],
+                simulated_screen=None,
+                failure_reason=reason,
+                status="failed",
+            )
+            return updated_state
         if not can_generate_actions(state):
             raise ValueError(
                 "ActionNode 当前只支持无需规划和资源的 move、resize、update 需求"
@@ -51,6 +66,9 @@ class ActionNode(BaseNode):
             "requirement": state["requirement"].model_dump(mode="json"),
             "change_scope": state["change_scope"].model_dump(mode="json"),
         }
+        if state.get("screen_plan") is not None:
+            payload["screen_plan"] = state["screen_plan"].model_dump(mode="json")
+            payload["component_materials"] = plan_materials(state)
         if state.get("repair_plan") is not None:
             payload.update(
                 repair_plan=state["repair_plan"].model_dump(mode="json"),
@@ -79,9 +97,14 @@ class ActionNode(BaseNode):
                     HumanMessage(content=json.dumps(payload, ensure_ascii=False)),
                 ]
             )
-            batch = ActionBatch.model_validate(
-                result.model_dump() if isinstance(result, BaseModel) else result
-            )
+            raw = result.model_dump() if isinstance(result, BaseModel) else result
+            if isinstance(result, ActionBatch) and state.get("screen_plan") is not None:
+                for source, target in zip(result.actions, raw["actions"]):
+                    if isinstance(source, AddAction):
+                        target["node"] = source.node.model_dump(exclude_unset=True)
+            batch = ActionBatch.model_validate(raw)
+            if state.get("screen_plan") is not None:
+                batch = assemble_plan_actions(state, batch)
         except ValidationError as error:
             updated_state["validation_passed"] = False
             updated_state["validation_errors"] = schema_errors(error)
@@ -102,12 +125,16 @@ class ActionNode(BaseNode):
 
 if __name__ == "__main__":
     import asyncio
+    import sys
 
     from pydantic import BaseModel
 
+    from app.processor.nodes.component_resource_node import ComponentResourceNode
     from app.processor.nodes.input_node import InputNode
+    from app.processor.nodes.validator_node import ValidatorNode
     from app.schemas.change_scope import ChangeScope
     from app.schemas.requirement import Requirement
+    from app.schemas.screen_plan import ScreenPlan
 
     async def main():
         state = InputNode().process(
@@ -151,8 +178,47 @@ if __name__ == "__main__":
             needs_planning=False,
             reason="明确的组件位移",
         )
+        # 加 --add 测试规划到新增动作，默认仍测试简单移动
+        if "--add" in sys.argv:
+            state = InputNode().process(
+                {
+                    "request": {
+                        "prompt": "保留已有组件，在顶部新增销售总览标题",
+                        "screen": state["input_context"].screen.model_dump(mode="json"),
+                    }
+                }
+            )
+            state["requirement"] = Requirement(
+                intent="modify_screen",
+                goal="新增标题",
+                needs_clarification=False,
+                changes=[{"target_scope": "screen", "operation": "add"}],
+            )
+            state["change_scope"] = ChangeScope(
+                scope="local",
+                needs_planning=True,
+                reason="顶部新增标题",
+            )
+            state = ComponentResourceNode().process(state)
+            state["screen_plan"] = ScreenPlan(
+                goal="新增标题",
+                design_summary="顶部标题",
+                layout_description="保留原图表",
+                components=[
+                    {
+                        "plan_id": "heading",
+                        "disposition": "add",
+                        "component_type": "text",
+                        "purpose": "显示销售总览",
+                        "design": {"text": "销售总览"},
+                        "layout": {"x": 100, "y": 40, "width": 500, "height": 60},
+                    }
+                ],
+            )
         node = ActionNode()
         final_state = await node.process(state)
+        if "--add" in sys.argv and final_state.get("actions") is not None:
+            final_state = ValidatorNode().process(final_state)
         print(
             json.dumps(
                 final_state,

app/processor/nodes/planner_node.py

@@ -18,6 +18,7 @@ class PlannerNode(BaseNode):
         updated_state: QueryState = state.copy()
         requirement = state["requirement"]
         scope = state["change_scope"]
+
         if (
             requirement.needs_clarification
             or requirement.intent
@@ -33,6 +34,7 @@ class PlannerNode(BaseNode):
         resources = state.get("component_resources")
         if resources is not None and resources.status != "resolved":
             raise ValueError("组件目录尚未就绪，不能继续规划")
+
         result = await get_llm(ScreenPlan).ainvoke(
             [
                 SystemMessage(content=PLANNER_SYSTEM_PROMPT),
@@ -42,7 +44,7 @@ class PlannerNode(BaseNode):
                             "input_context": context.model_dump(mode="json"),
                             "requirement": requirement.model_dump(mode="json"),
                             "change_scope": scope.model_dump(mode="json"),
-                            "component_resources": resources.model_dump(mode="json")
+                            "component_resources": resources.to_planner_context()
                             if resources is not None
                             else None,
                         },
@@ -51,7 +53,9 @@ class PlannerNode(BaseNode):
                 ),
             ]
         )
+
         plan = ScreenPlan.model_validate(result.model_dump())
+
         if resources is not None:
             supported_types = {component.type for component in resources.components}
             for component in plan.components:
@@ -65,6 +69,7 @@ class PlannerNode(BaseNode):
                         raise ValueError(
                             f"规划使用了目录中不存在的组件类型: {component.component_type}"
                         )
+
         existing_ids = {node.id for node in context.screen.nodes}
         planned_ids = {
             component.target_id
@@ -73,9 +78,11 @@ class PlannerNode(BaseNode):
         }
         if unknown := planned_ids - existing_ids:
             raise ValueError(f"规划引用了不存在的组件: {sorted(unknown)}")
+
         required_ids = {
             target for change in requirement.changes for target in change.target_ids
         }
+
         if missing := required_ids - planned_ids:
             raise ValueError(f"规划遗漏了需求中的组件: {sorted(missing)}")
         if scope.scope == "local":
@@ -86,6 +93,7 @@ class PlannerNode(BaseNode):
             }
             if outside := changed_ids - set(scope.target_ids):
                 raise ValueError(f"局部规划修改了范围外的组件: {sorted(outside)}")
+
         # 原始约束和假设不能在规划阶段被无声丢弃
         plan.constraints = list(
             dict.fromkeys([*requirement.constraints, *plan.constraints])
@@ -94,6 +102,7 @@ class PlannerNode(BaseNode):
             dict.fromkeys([*requirement.assumptions, *plan.assumptions])
         )
         updated_state["screen_plan"] = plan
+
         return updated_state
 
 

app/processor/nodes/reflection_node.py

@@ -6,6 +6,7 @@ from langchain_core.exceptions import OutputParserException
 from langchain_core.messages import HumanMessage, SystemMessage
 from pydantic import BaseModel, ValidationError
 
+from app.actions.plan import plan_materials
 from app.clients.llm import get_llm
 from app.processor.base import BaseNode
 from app.processor.state import QueryState
@@ -33,6 +34,10 @@ class ReflectionNode(BaseNode):
             else None,
         }
 
+        if state.get("screen_plan") is not None:
+            payload["screen_plan"] = state["screen_plan"].model_dump(mode="json")
+            payload["component_materials"] = plan_materials(state)
+
         try:
             result = await llm_client.ainvoke(
                 [
@@ -56,6 +61,7 @@ class ReflectionNode(BaseNode):
 
 if __name__ == "__main__":
     import asyncio
+
     from app.processor.nodes.input_node import InputNode
     from app.schemas.action_validation import ActionValidationError
     from app.schemas.actions import UpdateAction

app/processor/nodes/validator_node.py

@@ -2,11 +2,12 @@
 
 from pydantic import BaseModel, ValidationError
 
+from app.actions.plan import validate_plan_actions
 from app.actions.registry import apply_action
 from app.processor.base import BaseNode
 from app.processor.state import QueryState
 from app.schemas.action_validation import ActionValidationError, schema_errors
-from app.schemas.actions import ActionBatch
+from app.schemas.actions import ActionBatch, AddAction
 
 
 class ValidatorNode(BaseNode):
@@ -36,7 +37,28 @@ class ValidatorNode(BaseNode):
 
         # 需求范围检查集中在校验节点，错误统一进入修正循环
         requirement = state.get("requirement")
-        if requirement is not None:
+        if state.get("screen_plan") is not None:
+            errors = validate_plan_actions(state, batch)
+            if errors:
+                updated_state["validation_passed"] = False
+                updated_state["validation_errors"] = errors
+                updated_state["simulated_screen"] = None
+                return updated_state
+        elif requirement is not None:
+            # 规划到动作的范围校验尚未接入，不能将新增混入简单修改
+            if any(isinstance(action, AddAction) for action in batch.actions):
+                updated_state["validation_passed"] = False
+                updated_state["validation_errors"] = [
+                    ActionValidationError(
+                        action_index=index,
+                        code="scope_error",
+                        message="新增动作尚未接入需求范围校验，当前仅支持独立模拟执行",
+                    )
+                    for index, action in enumerate(batch.actions)
+                    if isinstance(action, AddAction)
+                ]
+                updated_state["simulated_screen"] = None
+                return updated_state
             allowed = {
                 (target, change.operation)
                 for change in requirement.changes