@shundoo-ai/dsh-cosmic 1.0.19 → 1.0.21

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/_core/cmd_metaops.py

@@ -281,10 +281,43 @@ def _load_ops(ops_arg):
 # ─── buildMeta ────────────────────────────────────────────────────────────────
 
 def do_build_meta(cfg, token, artifact, biz_app_id, biz_unit_id,
-                  template_number="bos_billtpl"):
+                  template_number="bos_billtpl", on_write_result=None):
     """Execute AI metadata modeling. When bizUnitId is empty, Java backend handles automatically."""
     # Blank template: send "" when "blank" or empty string passed, backend treats as null
     tn = "" if (not template_number or str(template_number).strip().lower() in ("blank", "blankpage")) else str(template_number).strip()
+    from .cmd_forms import resolve_template_input
+    roots = [item for item in artifact.get("entities", []) if not item.get("parentEntityId")]
+    model_type = ({"BillEntity": "BillFormModel", "BaseEntity": "BaseFormModel",
+                   "MainEntity": "DynamicFormModel"}.get(roots[0].get("type"))
+                  if len(roots) == 1 else None)
+    try:
+        tn = resolve_template_input(cfg, token, tn, biz_app_id=biz_app_id, model_type=model_type)
+    except Exception as exc:
+        code = str(exc).partition(":")[0]
+        return {"status": False, "errorCode": code if code.isupper() and " " not in code else "TEMPLATE_LOOKUP_UNCONFIRMED",
+                "message": str(exc), "writeAttempted": False}
+
+    for root in roots:
+        number = str(root.get("entityKey") or "").strip()
+        if not number:
+            return {"status": False, "errorCode": "ARTIFACT_TARGET_MISSING",
+                    "message": "An exact root entityKey is required before creation", "writeAttempted": False}
+        try:
+            lookup = do_query_forms(cfg, token, keyword=number)
+        except Exception as exc:
+            return {"status": False, "errorCode": "TARGET_LOOKUP_UNCONFIRMED",
+                    "message": str(exc), "writeAttempted": False}
+        if not _is_api_success(lookup) or not isinstance(lookup.get("data"), list):
+            return {"status": False, "errorCode": "TARGET_LOOKUP_UNCONFIRMED",
+                    "message": "Target conflict lookup failed; no creation was attempted",
+                    "writeAttempted": False, "cause": lookup}
+        matches = [row for row in lookup["data"] if isinstance(row, dict)
+                   and str(row.get("formNumber") or "").strip().casefold() == number.casefold()]
+        if matches:
+            return {"status": False, "errorCode": "TARGET_ALREADY_EXISTS",
+                    "message": "The exact number already belongs to an online object; it is not a creation receipt",
+                    "writeAttempted": False, "data": {"requestedNumber": number, "conflicts": matches},
+                    "retryAdvice": "user_input_required"}
 
     compiled = copy.deepcopy(artifact)
     trigger_settings = []
@@ -302,6 +335,8 @@ def do_build_meta(cfg, token, artifact, biz_app_id, biz_unit_id,
         "artifact": compiled
     }
     result = _api_call(cfg, token, "buildMeta", payload, method="POST")
+    if on_write_result is not None:
+        on_write_result(copy.deepcopy(result))
     data = result.get("data") if isinstance(result, dict) else None
     if not isinstance(data, dict):
         return result

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/_core/cmd_plugins.py

@@ -1,20 +1,20 @@
 """插件注册 API：表单插件的注册/修改/删除，以及 KingScript 脚本的查询与创建。
 
 从 commands.py 拆出。与 cmd_operations 同属叶子层，主要依赖 _core.config 的 _api_call。
-KingScript 写入前会尝试调用编码侧源码门禁（本语言树 scripts/kingscript_source_gate.py）；
+KingScript 写入前会尝试调用编码侧源码门禁（app-build/scripts/kingscript_source_gate.py）；
 该依赖是可选的：缺失时诚实降级放行，绝不因基础设施缺失而阻断（见 kingscript_write_guard）。
 """
 
 from __future__ import annotations
 
 import sys
+import json
 from pathlib import Path
 
 from .config import _api_call
 
-# 编码侧 KingScript 门禁目录（parents[4]/scripts 在 canonical 与 .locales/zh 两套目录树中
-# 都成立）。元数据 CLI 与编码侧刻意解耦，故此依赖可选：门禁模块缺失时守卫诚实降级放行，
-# 仅当门禁报出 P0 违规时才阻断不可逆写入。
+# 编码侧 KingScript 门禁目录（app-build/scripts）。元数据 CLI 与编码侧刻意解耦，故此
+# 依赖可选：门禁模块缺失时守卫诚实降级放行，仅当门禁报出 P0 违规时才阻断不可逆写入。
 _KINGSCRIPT_GATE_DIR = Path(__file__).resolve().parents[4] / "scripts"
 
 
@@ -246,70 +246,95 @@ def script_readback_verification(rows, expected, result_data):
 
 # ─── 插件注册 API ──────────────────────────────────────────────────────────────
 
-def do_register_plugin(cfg, token, form_number, plugin_config):
-    """注册插件到表单。
+def validate_local_java_registration(app_root, plugin_config):
+    """Reject contradictions with a locally declared Java source; no runtime claim."""
+    if not app_root or plugin_config.get("pluginType", "JAVA") != "JAVA":
+        return
+    archive = Path(app_root) / "archive.json"
+    if not archive.is_file():
+        return
+    entries = json.loads(archive.read_text(encoding="utf-8-sig")).get("javas", [])
+    class_name = plugin_config["className"]
+    candidates = [entry for entry in entries if isinstance(entry, dict)
+                  and entry.get("className") in (class_name, class_name.rsplit(".", 1)[-1])]
+    if not candidates:
+        return  # Existing deployed classes without local declarations remain supported.
+    if len(candidates) != 1:
+        raise ValueError("PLUGIN_LOCAL_SOURCE_AMBIGUOUS: multiple archive entries for " + class_name)
+    if str(_KINGSCRIPT_GATE_DIR) not in sys.path:
+        sys.path.insert(0, str(_KINGSCRIPT_GATE_DIR))
+    from plugin_source_gate import validate_registration_entry
+    return validate_registration_entry(candidates[0], plugin_config["targetType"], class_name)
+
+
+def do_register_plugin(cfg, token, form_number, plugin_config, app_root=None):
+    """注册插件 to Form.
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        form_number: 表单编码
-        plugin_config: 插件配置字典，包含:
-            - className (必填): 插件类名。Java插件为全限定类名，脚本插件为脚本路径
-            - targetType (必填): 注册目标类型
-                - 'BILL_FORM': PC 表单插件
-                - 'LIST_FORM': PC 列表插件
-                - 'MOBILE_BILL_FORM': 移动表单插件
-                - 'MOBILE_LIST_FORM': 移动列表插件
-                - 'OPERATION': 操作插件（需要 operationKey）
-                - 'BASEDATA_CONTROLLER': 基础资料个性化控制器（仅基础资料表单）
-            - pluginType: 插件类型 'JAVA'(默认) 或 'KINGSCRIPT'
-            - fpk: 脚本插件FPK标识（仅 pluginType=KINGSCRIPT 时必填）
-            - description: 插件描述
-            - enabled: 是否启用，默认 true
-            - bizAppId: 所属应用 ID
-            - operationKey: 操作 Key（仅 OPERATION 类型需要）
+        form_number: Form number
+        plugin_config: 插件Configuration dict, 包含:
+            - className (必填): Plugin class name. Java插件为全限定类名, 脚本插件为脚本路径
+            - targetType (必填): Registration target type
+                - 'BILL_FORM': PC Form插件
+                - 'LIST_FORM': PC list plugin
+                - 'MOBILE_BILL_FORM': 移动Form插件
+                - 'MOBILE_LIST_FORM': Mobile list plugin
+                - 'OPERATION': 操作插件 (需要 operationKey)
+                - 'BASEDATA_CONTROLLER': 基础资料个性化控制器 (仅基础资料Form)
+            - pluginType: Plugin type 'JAVA'(default) 或 'KINGSCRIPT'
+            - fpk: 脚本插件FPK标识 (仅 pluginType=KINGSCRIPT 时必填)
+            - description: Plugin description
+            - enabled: Whether enabled, default true
+            - bizAppId: Owning app ID
+            - operationKey: Operation Key (仅 OPERATION 类型需要)
 
     Returns:
-        dict: API 响应结果
+        dict: API response result
     """
+    source_check = validate_local_java_registration(app_root, plugin_config)
     payload = dict(plugin_config)
     payload["formNumber"] = form_number
-    return _api_call(cfg, token, "registerPlugin", payload, method="POST")
+    result = _api_call(cfg, token, "registerPlugin", payload, method="POST")
+    if source_check and isinstance(result, dict):
+        result["sourceCheck"] = source_check
+    return result
 def do_update_plugin(cfg, token, form_number, plugin_config):
-    """修改插件。
+    """修改插件.
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        form_number: 表单编码
-        plugin_config: 插件配置字典，包含:
-            - className (必填): 目标插件类名（用于定位，不可修改）
-            - targetType (必填): 插件所在目标类型
-            - operationKey: 操作 Key（仅 OPERATION 类型需要）
-            - description: 新的插件描述
-            - enabled: 是否启用
-            - bizAppId: 所属应用 ID
-            - fpk: 脚本插件FPK标识（仅脚本插件可修改）
+        form_number: Form number
+        plugin_config: 插件Configuration dict, 包含:
+            - className (必填): 目标Plugin class name (用于定位, 不可修改)
+            - targetType (必填): Target type where plugin resides
+            - operationKey: Operation Key (仅 OPERATION 类型需要)
+            - description: 新的Plugin description
+            - enabled: Whether enabled
+            - bizAppId: Owning app ID
+            - fpk: 脚本插件FPK标识 (仅脚本插件可修改)
 
     Returns:
-        dict: API 响应结果
+        dict: API response result
     """
     payload = dict(plugin_config)
     payload["formNumber"] = form_number
     return _api_call(cfg, token, "updatePlugin", payload, method="POST")
 def do_delete_plugin(cfg, token, form_number, target_type, class_name, operation_key=None):
-    """删除插件。
+    """删除插件.
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        form_number: 表单编码
-        target_type: 插件所在目标类型
-        class_name: 要删除的插件类名（Java为全限定类名，脚本为脚本路径）
-        operation_key: 操作 Key（仅 OPERATION 类型需要）
+        form_number: Form number
+        target_type: Target type where plugin resides
+        class_name: 要删除的Plugin class name (Java为全限定类名, 脚本为脚本路径)
+        operation_key: Operation Key (仅 OPERATION 类型需要)
 
     Returns:
-        dict: API 响应结果
+        dict: API response result
     """
     payload = {
         "formNumber": form_number,
@@ -320,51 +345,49 @@ def do_delete_plugin(cfg, token, form_number, target_type, class_name, operation
         payload["operationKey"] = operation_key
     return _api_call(cfg, token, "deletePlugin", payload, method="POST")
 def do_query_editable_plugins(cfg, token, form_number):
-    """查询可编辑插件列表。
+    """查询可编辑插件列表.
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        form_number: 表单编码
+        form_number: Form number
 
     Returns:
-        dict: 包含 success 和 data 字段。
-              data 为插件列表，每个元素包含:
-              - className: 插件类名
-              - description: 插件描述
-              - enabled: 是否启用
-              - bizAppId: 所属应用ID
-              - location: 插件所属位置类型
-              - operationKey: 操作 Key（仅 OPERATION 类型有值）
-              - operationName: 操作名称
-              - pluginType: 插件类型（JAVA/KINGSCRIPT/JAVASCRIPT）
-              - fpk: 脚本插件FPK标识（Java插件为null）
+        dict: 包含 success 和 data Field.
+              data 为插件列表, 每个元素包含:
+              - className: Plugin class name
+              - description: Plugin description
+              - enabled: Whether enabled
+              - bizAppId: Owning app ID
+              - location: Plugin location type
+              - operationKey: Operation Key (仅 OPERATION 类型有值)
+              - operationName: Operation name
+              - pluginType: Plugin type (JAVA/KINGSCRIPT/JAVASCRIPT)
+              - fpk: 脚本插件FPK标识 (Java插件为null)
     """
     payload = {"formNumber": form_number}
     return _api_call(cfg, token, "queryEditablePlugins", payload, method="GET")
 def do_query_available_scripts(cfg, token, form_number, target_type):
-    """查询指定表单可选的 KingScript 脚本列表。
+    """查询指定Form可选的 KingScript 脚本列表.
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        form_number: 表单编码
-        target_type: 目标类型（BILL_FORM/LIST_FORM/MOBILE_BILL_FORM/MOBILE_LIST_FORM/OPERATION/BASEDATA_CONTROLLER）
+        form_number: Form number
+        target_type: 目标类型 (BILL_FORM/LIST_FORM/MOBILE_BILL_FORM/MOBILE_LIST_FORM/OPERATION/BASEDATA_CONTROLLER)
 
     Returns:
-        dict: 包含 data 字段，data 为脚本列表，每个元素包含:
-              - fpk: 脚本记录 ID（注册时作为 fpk 传入）
-              - className: 脚本完整路径（注册时作为 className 传入）
-              - scriptName: 脚本名称
-              - scriptNumber: 脚本编码
-              - scriptType: 脚本类型编码
-              - description: 脚本描述
-              - bizAppId: 脚本所属应用 ID
+        dict: 包含 data Field, data 为脚本列表, 每个元素包含:
+              - fpk: Script record ID (注册时作为 fpk 传入)
+              - className: Script full path (注册时作为 className 传入)
+              - scriptName: Script name
+              - scriptNumber: Script number
+              - scriptType: Script type code
+              - description: Script description
+              - bizAppId: 脚本Owning app ID
     """
     payload = {"formNumber": form_number, "targetType": target_type}
     return _api_call(cfg, token, "queryAvailableScripts", payload, method="GET")
-
-
 def kingscript_write_guard(script_config):
     """createScript 写入前的 KingScript 源码门禁（fail-closed，覆盖所有调用点）。
 
@@ -398,38 +421,40 @@ def kingscript_write_guard(script_config):
         "success": False,
         "errorCode": "KINGSCRIPT_GATE_FAILED",
         "message": (
-            "createScript 已拒绝：KingScript 源码违反 P0 硬约束。该写入不可逆且平台不提供"
-            "编译信号，故写入前在本地门禁校验。请修正后重试；被拒绝的 scriptNumber 从未"
-            "写入，可直接复用。违规项：" + summary
+            "createScript rejected: the KingScript source violates the P0 hard "
+            "constraints. This write is irreversible and the platform gives no compile "
+            "signal, so the source is gated locally before the write. Fix it and retry; "
+            "the rejected scriptNumber was never written and can be reused. "
+            "Violations: " + summary
         ),
         "data": {"success": False, "gate": verdict},
     }
 
 
 def do_create_script(cfg, token, script_config):
-    """创建 KingScript 脚本记录到 ide_pluginscript。
+    """创建 KingScript 脚本记录 to  ide_pluginscript.
 
     写入前先过 kingscript_write_guard：若自带 scriptContent 违反 P0 硬约束，返回 blocked
     envelope 而绝不发出不可逆写入（覆盖 CLI dispatch 与编程式两个调用点）。
 
     Args:
-        cfg: 配置字典
+        cfg: Configuration dict
         token: access_token
-        script_config: 脚本创建参数字典，包含:
-            - bizAppId (必填): 脚本所属应用ID
-            - formNumber (必填): 关联表单编码
-            - scriptNumber (必填): 脚本编码（仅字母、数字、下划线）
-            - scriptName (必填): 脚本名称
-            - targetType (必填): 脚本目标类型
-            - description: 脚本描述
-            - scriptContent: 脚本源代码（不传则使用系统模板）
+        script_config: 脚本创建parameters字典, 包含:
+            - bizAppId (必填): 脚本Owning app ID
+            - formNumber (必填): 关联Form number
+            - scriptNumber (必填): Script number (仅字母, 数字, 下划线)
+            - scriptName (必填): Script name
+            - targetType (必填): Script target type
+            - description: Script description
+            - scriptContent: 脚本源代码 (不传则使用系统模板)
 
     Returns:
-        dict: API 响应结果，data 包含:
-              - success: 是否创建成功
-              - message: 结果消息
-              - fpk: 脚本记录 ID
-              - className: 脚本完整路径
+        dict: API response result, data 包含:
+              - success: 是否创建succeeded
+              - message: Result message
+              - fpk: Script record ID
+              - className: Script full path
               - compiled: 平台创建时的编译标志位。**live 探测证实恒为 false（连系统模板
                 基线也是），并非成功/失败信号**；KingScript 的真正编译不发生在 createScript，
                 故本 CLI 不消费该字段，源码正确性改由写入前的 kingscript_write_guard 本地