@xdxer/dingtalk-agent 0.1.5-beta.10 → 0.1.5-beta.12

package/skills/platforms/multica-dingtalk/dta-ops-multica/scripts/multica_ext.py

@@ -12,6 +12,7 @@ shell proxy cannot break calls to intranet/pre endpoints.
 """
 
 import argparse
+import hashlib
 import json
 import os
 import re
@@ -629,14 +630,67 @@ def load_predicate_registry(manifest_path: str) -> Dict[str, Any]:
     return predicates
 
 
+PREDICATE_REGISTRY_SCHEMA = "dingtalk-agent/predicate-registry@1"
+PREDICATE_REGISTRY_KEYS = ["$schema", "hash", "predicates", "project", "schedules"]
+
+
+def _stable_json(value: Any) -> str:
+    """src/events.ts stableStringify 的镜像：键排序、无空格。改一边必须改另一边——
+    两套序列化分叉就等于两个不同的 hash，投影的完整性校验会互相判错。"""
+    return json.dumps(value, sort_keys=True, separators=(",", ":"), ensure_ascii=False)
+
+
+def registry_hash(projection: Dict[str, Any]) -> str:
+    unsigned = {k: v for k, v in projection.items() if k != "hash"}
+    return hashlib.sha256(_stable_json(unsigned).encode("utf-8")).hexdigest()
+
+
+def load_delivered_registry(path: str) -> Dict[str, Any]:
+    """读 deploy 交付进 runtime 的受管 registry 投影（issue #46）。
+
+    这是运行侧真正能拿到的那份文件——manifest 不随 skill-push 进入 runtime，所以运行拍
+    读的是它。structure + 完整性 hash 都校验：文件缺失/被改/被截断一律非零退出，判据
+    解析不出来时这一拍不得使用完成措辞。hash 是无密钥完整性校验，不证签发方。"""
+    try:
+        with open(path, "r", encoding="utf-8") as f:
+            projection = json.load(f)
+    except OSError as e:
+        fail(f"registry 投影读不到: {path} ({e})——判据未交付，本拍不得声称完成")
+    except json.JSONDecodeError as e:
+        fail(f"registry 投影不是合法 JSON: {path} ({e})")
+    if not isinstance(projection, dict):
+        fail("registry 投影必须是 JSON object")
+    if sorted(projection) != PREDICATE_REGISTRY_KEYS:
+        fail(f"registry 投影字段集必须恰为 {'/'.join(PREDICATE_REGISTRY_KEYS)}")
+    if projection.get("$schema") != PREDICATE_REGISTRY_SCHEMA:
+        fail(f"registry 投影 schema 非法: {projection.get('$schema')!r}")
+    predicates = projection.get("predicates")
+    if not isinstance(predicates, dict):
+        fail("registry 投影 predicates 必须是 object")
+    actual = registry_hash(projection)
+    if projection.get("hash") != actual:
+        fail(
+            "registry 投影 hash 与内容不一致（declared="
+            f"{str(projection.get('hash'))[:12]}, actual={actual[:12]}）——"
+            "交付的判据被改过或截断，fail-closed"
+        )
+    return projection
+
+
 LOCAL_COMMANDS = {"predicate-resolve"}
 
 
 def cmd_predicate_resolve(ctx: Optional[Ctx], args: argparse.Namespace) -> None:
-    """运行时路径：拿到 autopilot description（或直接给 id）→ 在同一份 manifest
-    注册表里解析出判据正文。未注册 / marker 缺失 / 冲突都非零退出——判据解析
+    """判据解析：从声明侧 manifest（operator）或交付进 runtime 的受管投影（运行拍）
+    解析出判据正文。未注册 / marker 缺失 / 冲突 / 投影 hash 对不上都非零退出——判据解析
     失败时这一拍不能假装知道怎么算完成。"""
-    predicates = load_predicate_registry(args.manifest)
+    if args.registry:
+        projection = load_delivered_registry(args.registry)
+        predicates = projection["predicates"]
+        resolved_from_registry = projection["hash"]
+    else:
+        predicates = load_predicate_registry(args.manifest)
+        resolved_from_registry = ""
     if args.id:
         pid = args.id
         source = "flag"
@@ -652,8 +706,13 @@ def cmd_predicate_resolve(ctx: Optional[Ctx], args: argparse.Namespace) -> None:
         source = "description-marker"
     entry = predicates.get(pid)
     if entry is None:
-        fail(f"predicate:{pid} 未在 manifest 注册表登记（registered={sorted(predicates)}）")
-    out({"id": pid, "resolvedFrom": source, "predicate": entry})
+        where = "交付的 registry 投影" if args.registry else "manifest 注册表"
+        fail(f"predicate:{pid} 未在{where}登记（registered={sorted(predicates)}）")
+    out({
+        "id": pid, "resolvedFrom": source, "predicate": entry,
+        "source": "delivered-registry" if args.registry else "project-manifest",
+        **({"registryHash": resolved_from_registry} if resolved_from_registry else {}),
+    })
 
 
 def _annotate_predicate_ref(autopilot: Any) -> Any:
@@ -1292,10 +1351,17 @@ def build_parser() -> argparse.ArgumentParser:
     p = cmd(
         "predicate-resolve",
         cmd_predicate_resolve,
-        "Resolve a completion predicate against the project manifest registry "
-        "(runtime reads the SAME dingtalk-agent.json the declaration lives in)",
+        "Resolve a completion predicate — from the delivered runtime registry projection "
+        "(--registry, what a schedule run actually has) or from the declaring manifest "
+        "(--manifest, operator-side against the local checkout)",
+    )
+    where_group = p.add_mutually_exclusive_group(required=True)
+    where_group.add_argument("--manifest", help="path to dingtalk-agent.json (declaration side)")
+    where_group.add_argument(
+        "--registry",
+        help="path to the delivered predicate-registry.json inside the skill tree "
+             "(runtime side; schema + integrity hash are verified)",
     )
-    p.add_argument("--manifest", required=True, help="path to dingtalk-agent.json")
     src_group = p.add_mutually_exclusive_group(required=True)
     src_group.add_argument("--id", help="predicate id (skip marker parsing)")
     src_group.add_argument("--description", help="autopilot description; the [dta-completion-predicate] marker is parsed out")