@kenhkl/agent-moss 0.12.6 → 0.12.8

package/dist/agents/base.py

@@ -59,11 +59,48 @@ class AgentExtensions:
     extra_skills: list[dict] = field(default_factory=list)
 
     @classmethod
-    def from_json(cls, rules_file: Path) -> "AgentExtensions":
+    def merge(cls, *exts: "AgentExtensions | None") -> "AgentExtensions | None":
+        """合并多个 AgentExtensions（如 agent 规则 + 场景规则），追加式拼接各 extra_* 列表。
+
+        全部为 None 时返回 None（通用模式）。非 None 时以第一个非空实例为骨架，
+        其余实例的 extra_* / builtin_safe_* 列表依次追加在后（不覆盖）。
+        """
+        non_null = [e for e in exts if e is not None]
+        if not non_null:
+            return None
+        base = non_null[0]
+        return cls(
+            agent_id=base.agent_id,
+            description=base.description,
+            extra_command_patterns=[
+                p for e in non_null for p in e.extra_command_patterns
+            ],
+            extra_injection_keywords=[
+                k for e in non_null for k in e.extra_injection_keywords
+            ],
+            extra_sensitive_paths=[
+                sp for e in non_null for sp in e.extra_sensitive_paths
+            ],
+            builtin_safe_skills=[
+                s for e in non_null for s in e.builtin_safe_skills
+            ],
+            builtin_safe_action_types=[
+                t for e in non_null for t in e.builtin_safe_action_types
+            ],
+            extra_skills=[
+                sk for e in non_null for sk in e.extra_skills
+            ],
+        )
+
+    @classmethod
+    def from_json(cls, rules_file: Path, id_key: str = "agent_id") -> "AgentExtensions":
         """从 rules.json 加载 AgentExtensions。
 
         Args:
-            rules_file: agent_moss/agents/<id>/rules.json 的绝对路径
+            rules_file: agent_moss/agents/<id>/rules.json 的绝对路径（场景规则传
+                        agent_moss/scenarios/<id>/rules.json，id_key="scenario_id"）
+            id_key: JSON 中的 id 字段名。agent 规则默认 "agent_id"；
+                    场景规则（agent_moss/scenarios/<id>/rules.json）用 "scenario_id"。
 
         Returns:
             AgentExtensions 实例
@@ -74,9 +111,9 @@ class AgentExtensions:
         with open(rules_file, "r", encoding="utf-8") as f:
             data = json.load(f)
 
-        agent_id = data.get("agent_id", "")
+        agent_id = data.get(id_key, "")
         if not agent_id:
-            raise ValueError(f"rules.json 缺少 agent_id 字段: {rules_file}")
+            raise ValueError(f"rules.json 缺少 {id_key} 字段: {rules_file}")
 
         # extra_command_patterns: dict → CommandPattern
         extra_cmd_patterns: list[CommandPattern] = []