Improve data skill routing and tool organization

tests/test_data_agent_records.py

@@ -229,6 +229,50 @@ target: Agent(tag="life_service")
             '建议先生成 2 条单轮，输出到 tasks/demo/records.jsonl',
         )
 
+    def test_generation_goal_requires_declared_targets_before_review(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            with self.assertRaisesRegex(Exception, 'must include target or target_definitions'):
+                prepare_generation_goal(
+                    root=tmp_dir,
+                    dataset_label='地图和生活边界数据',
+                    goal_summary='生成附近生活服务边界数据',
+                    coverage='附近吃喝玩乐',
+                    exclusions='不要生成导航路线类 query',
+                )
+
+    def test_generation_plan_inherits_targets_from_confirmed_goal(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            goal_payload = prepare_generation_goal(
+                root=tmp_dir,
+                dataset_label='餐饮和导航边界数据',
+                goal_summary='生成餐饮服务和地图导航边界数据',
+                target_definitions=[
+                    {'name': '餐饮服务', 'target': 'Agent(tag="餐饮服务")', 'rule': '找附近餐饮'},
+                    {'name': '地图导航', 'target': 'Agent(tag="地图导航")', 'rule': '明确导航'},
+                ],
+                coverage='餐饮服务和地图导航边界',
+                exclusions='不要生成无关闲聊',
+            )
+            goal_id = goal_payload['goal']['goal_id']
+            confirm_generation_goal(root=tmp_dir, goal_id=goal_id, confirmation='确认目标')
+
+            plan_payload = prepare_generation_plan(
+                root=tmp_dir,
+                confirmed_goal_id=goal_id,
+                dataset_label='餐饮和导航边界数据',
+                target='',
+                total_count=2,
+                turn_mix='2 条单轮',
+                coverage='餐饮服务和地图导航边界',
+                exclusions='不要生成无关闲聊',
+                output_path='tasks/demo/artifacts',
+            )
+
+        self.assertEqual(
+            [item['target'] for item in plan_payload['plan']['target_definitions']],
+            ['Agent(tag="餐饮服务")', 'Agent(tag="地图导航")'],
+        )
+
     def test_generation_plan_dedupes_existing_task_output_path(self) -> None:
         with tempfile.TemporaryDirectory() as tmp_dir:
             existing = Path(tmp_dir) / 'tasks' / 'demo' / 'artifacts'
@@ -488,6 +532,55 @@ target: Agent(tag="life_service")
         self.assertEqual(export_payload['record_count'], 1)
         self.assertEqual(len(exported_lines), 1)
 
+    def test_data_agent_tools_route_relative_outputs_to_session_output(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            root = Path(tmp_dir)
+            scratchpad = root / '.port_sessions' / 'accounts' / 'alice' / 'sessions' / 's1' / 'scratchpad'
+            scratchpad.mkdir(parents=True)
+            context = build_tool_context(AgentRuntimeConfig(cwd=root), scratchpad_directory=scratchpad)
+            registry = default_tool_registry()
+
+            plan_result = execute_tool(
+                registry,
+                'data_agent_prepare_generation_plan',
+                {
+                    'direct_review': True,
+                    'dataset_label': '地图和生活边界数据',
+                    'target': 'Agent(tag="life_service")',
+                    'total_count': 1,
+                    'turn_mix': '1 条单轮',
+                    'coverage': '附近吃喝玩乐',
+                    'exclusions': '不要生成导航路线类 query',
+                    'output_path': 'output/demo/records.jsonl',
+                },
+                context,
+            )
+            self.assertTrue(plan_result.ok, plan_result.content)
+            plan_payload = json.loads(plan_result.content)
+
+            records = normalize_dataset_draft(
+                '''
+# dataset_label: 地图和生活边界数据
+### case: 附近餐饮查询
+用户: 附近有什么好吃的
+target: Agent(tag="life_service")
+'''.strip(),
+                batch_id='demo',
+                base_timestamp=1_755_567_930_500,
+            )['records']
+            export_result = execute_tool(
+                registry,
+                'data_agent_export_dataset_records',
+                {'records': records, 'output_path': 'output/demo/records.jsonl'},
+                context,
+            )
+            self.assertTrue(export_result.ok, export_result.content)
+            export_payload = json.loads(export_result.content)
+
+        expected = '.port_sessions/accounts/alice/sessions/s1/output/demo/records.jsonl'
+        self.assertEqual(plan_payload['plan']['output_path'], expected)
+        self.assertEqual(export_payload['output_path'], expected)
+
 
 if __name__ == '__main__':
     unittest.main()