@shundoo-ai/dsh-cosmic 1.0.21 → 1.0.22

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/cosmic_api.py

@@ -877,7 +877,7 @@ class _PostBuildWriteError(ValueError):
 
 
 def _attach_post_build_phase_failure(summary, payload, *, phase, app_root,
-                                    artifact_path, pending_write=None):
+                                    artifact_path, pending_write=None, verification=None):
   """A successful root save survives a later write or verification failure."""
   targets = [
     {"formId": row["formId"],
@@ -910,6 +910,15 @@ def _attach_post_build_phase_failure(summary, payload, *, phase, app_root,
     "allowedNextActions": ["getFormSchema", "getProperties", "listElements"],
     "modelInstruction": "Preserve the saved form and the original artifact. Inspect the exact retained target before a narrow existing-form repair; never rerun emit, runBatch or buildMeta for this artifact. Reconcile every failed or unknown post-write before retrying. The batch results use ok and phase, not success.",
   })
+  issues = (verification or {}).get("issues") or []
+  counts = (verification or {}).get("summary") or {}
+  if phase == "verify" and issues and counts.get("failed") == len(issues) and not any(counts.get(key) for key in ("errors", "warnings", "skipped")) and all(item.get("status") == "fail" and item.get("type") in
+      {"property_equals", "combo_options_equal", "unit_binding_equals"} for item in issues):
+    summary.update({"retryAdvice": "repair_observed_configuration", "reconciliation": [],
+      "allowedNextActions": ["existing_form_writer", "report_blocker"],
+      "modelInstruction": "Native readback already isolated the configuration differences. Reuse verification.issues (expected and actual) and verifiedTargets; repair only those named differences through their existing-form writers. Do not rediscover the form, export DYM or replay successful writes. If the requested stored values are unsupported, report that exact boundary instead of substituting values."})
+    summary["repairPlans"][0].update({"observedIssues": issues,
+      "precondition": "Use the existing independent readback; successful configuration is retained. Re-read only if another write changes the target or a narrow repair remains unknown."})
   return summary
 
 
@@ -1034,8 +1043,8 @@ def _apply_form_composition_failure_contract(
 def _compact_verified_targets(report):
   """Expose successful read-back assertions without forcing a second query.
 
-  The full verifier report stays internal.  Callers only need the assertion
-  type and exact target to prove that authored entities and fields landed.
+  Include the checked property and values so a successful receipt can be reused
+  without guessing what property_equals meant or exporting another snapshot.
   """
   evidence = []
   for result in getattr(report, "results", []) or []:
@@ -1045,7 +1054,15 @@ def _compact_verified_targets(report):
     assertion_type = str(getattr(spec, "type", "") or "").strip()
     target = str(getattr(spec, "target", "") or "").strip()
     if assertion_type and target:
-      evidence.append({"type": assertion_type, "target": target})
+      item = {"type": assertion_type, "target": target}
+      prop = (getattr(spec, "metadata", None) or {}).get("property")
+      if prop:
+        item["property"] = prop
+      if hasattr(spec, "expected"):
+        item["expected"] = spec.expected
+      if hasattr(result, "actual"):
+        item["actual"] = result.actual
+      evidence.append(item)
   return evidence
 
 
@@ -1358,32 +1375,33 @@ def _resolve_template_number(args_template, artifact_path, manifest):
   submit BD missing template number as a bill, causing BillNoField error and masking upstream emit issues.
   Caller must check return value and exit with error when None.
   """
-  if args_template is not None:
-    return str(args_template).strip()
-  tn = _read_artifact_template(artifact_path)
-  if tn is not None:
-    return tn
-  tn = _manifest_template_for(manifest, artifact_path)
-  if tn is not None:
-    return tn
-  return None
+  tn = args_template if args_template is not None else _read_artifact_template(artifact_path)
+  if tn is None:
+    tn = _manifest_template_for(manifest, artifact_path)
+  if tn is None:
+    return None
+  value = str(tn).strip()
+  return "blankPage" if value.casefold() in {"blank", "blankpage"} else value
 
 
-def _artifact_supports_blank_template(artifact):
-  """Return true only for a dynamic-form root that intentionally uses blank."""
+def _artifact_supports_blank_template(artifact, template=""):
+  """Permit an explicit blank bill while rejecting an accidentally missing template."""
   if not isinstance(artifact, dict):
     return False
   roots = [
     entity for entity in artifact.get("entities") or []
     if isinstance(entity, dict) and not entity.get("parentEntityId")
   ]
-  return len(roots) == 1 and str(roots[0].get("type") or "").strip() == "MainEntity"
+  if len(roots) != 1:
+    return False
+  root_type = str(roots[0].get("type") or "").strip()
+  return root_type == "MainEntity" or (root_type == "BillEntity" and template == "blankPage")
 
 
-def _artifact_file_supports_blank_template(artifact_path):
+def _artifact_file_supports_blank_template(artifact_path, template=""):
   try:
     with open(artifact_path, "r", encoding="utf-8-sig") as f:
-      return _artifact_supports_blank_template(json.load(f))
+      return _artifact_supports_blank_template(json.load(f), template)
   except (OSError, json.JSONDecodeError):
     return False
 
@@ -1974,32 +1992,128 @@ def _resolve_owned_report_target(cfg, token, args, command):
   return row
 
 
-def _attach_report_readback(cfg, token, form_id, section, expected, result_data):
-  schema = do_get_report_schema(cfg, token, form_id=form_id)
-  if section == "filters" and any(item.get("source") for item in expected):
-    from _core.report_ops import report_filter_source_expectations
-    schema["filterSourceExpectations"] = report_filter_source_expectations(cfg, token, expected)
+def _remove_owned_report_column(cfg, token, args):
+  """CLI 与 serve 共用同一归属、预检和回读闭环。"""
+  field_key = normalize_report_column_removal_input({"fieldKey": args.fieldKey})["fieldKey"]
+  if not getattr(args, "app_root", None) or not getattr(args, "formNumber", None):
+    raise ValueError("REPORT_INPUT_INVALID: removeReportColumn requires appRoot and exact formNumber")
+  if getattr(args, "dry_run", False):
+    return do_remove_report_column(cfg, None, args.formId or "", field_key,
+      dry_run=True, form_number=args.formNumber)
+  target = _resolve_owned_report_target(cfg, token, args, "removeReportColumn")
+  before = do_get_report_schema(cfg, token, form_id=target["formId"])
+  expected = plan_report_column_removal(before, field_key, args.app_root, args.formNumber, target["formId"])
+  result = do_remove_report_column(cfg, token, target["formId"], field_key, form_number=args.formNumber)
+  if not _is_api_success(result):
+    return result
+  return _attach_report_readback(cfg, token, target["formId"], "columnsRemove", expected,
+    result["data"], app_root=args.app_root, schema_before=before)
+
+
+def _attach_report_readback(cfg, token, form_id, section, expected, result_data,
+                            filter_editors=None, app_root=None, schema_before=None):
+  try:
+    schema = do_get_report_schema(cfg, token, form_id=form_id)
+    if not isinstance(schema, dict):
+      raise TypeError("Report read-back must be an object")
+  except Exception as exc:
+    # 写入已成功，回读失败不能诱导宿主重放写请求。
+    schema = {"readBackAvailable": False, "readBackSource": "unavailable",
+              "readBackError": type(exc).__name__}
+
+  def settle(result):
+    result["data"]["platformMutationApplied"] = True
+    if schema.get("readBackError"):
+      result["verification"]["errorType"] = schema["readBackError"]
+    if app_root:
+      try:
+        result["data"]["reportAuthoringState"] = sync_report_authoring_state(
+          app_root, result_data["formNumber"], form_id, section, expected,
+          schema_before or {}, schema, result["verification"],
+          result["data"].get("filterEditors"))
+      except (OSError, ValueError, KeyError, TypeError) as exc:
+        result["data"]["reportAuthoringState"] = {"status": "failed", "errorType": type(exc).__name__,
+          "platformMutationApplied": True, "reason": "Repair local state from current metadata; do not replay the platform write"}
+    return result
+  if section == "filters" and filter_editors:
+    # What the write's receipt showed about each typed editor; the read-back settles the rest.
+    schema["filterEditorOutcome"] = filter_editors
   if not schema.get("readBackAvailable"):
     # No canonical read-back on this deployment; the write already returned platform
-    # success, so report succeeded-but-unverified, not a mismatch.
-    return {
-      "status": True,
-      "errorCode": "0",
-      "message": None,
-      "data": result_data,
+    # success, so report succeeded-but-unverified, not a mismatch — unless the platform's own
+    # receipt already showed a filter editor other than the requested or legacy one.
+    receipt_mismatch = (section == "columnsRemove" or
+      bool(filter_editors) and filter_editors.get("typedFilterSupport") == "mismatch")
+    data = dict(result_data)
+    if filter_editors:
+      data["filterEditors"] = filter_editors
+    return settle({
+      "status": not receipt_mismatch,
+      "errorCode": "REPORT_READBACK_MISMATCH" if receipt_mismatch else "0",
+      "message": ("Deletion receipt succeeded but independent read-back is unavailable; do not replay"
+                  if section == "columnsRemove" else "平台回执显示过滤控件类型与请求不一致" if receipt_mismatch else None),
+      "data": data,
       "verification": {"verified": False, "reason": "canonical read-back unavailable"},
-    }
-  verification = report_readback_verification(section, expected, schema)
+    })
+  try:
+    verification = report_readback_verification(section, expected, schema)
+  except (ValueError, KeyError, TypeError, AttributeError) as exc:
+    verification = {"verified": False, "reason": "Invalid report read-back; reconcile before coding",
+                    "errorType": type(exc).__name__}
+  data = dict(result_data)
+  editors = verification.get("filterEditors") or filter_editors
+  if section == "filters" and editors:
+    data["filterEditors"] = editors
   result = {
     "status": bool(verification.get("verified")),
     "errorCode": "0" if verification.get("verified") else "REPORT_READBACK_MISMATCH",
     "message": None if verification.get("verified") else "报表写入回执成功，但独立回读与请求不一致",
-    "data": result_data,
+    "data": data,
     "verification": verification,
   }
+  return settle(result)
+
+
+_REPORT_STATE_WRITES = {"setReportColumns", "addReportColumns", "removeReportColumn", "setReportFilters", "setReportSorts",
+  "registerReportPlugin", "setReportProperties", "setReportQueryDataSource", "setReportFilterFieldConfig",
+  "setReportDefaultHiddenFields", "setReportRowBackColor", "registerReportPluginExt"}
+
+
+def _invalidate_unmerged_report_state(result, command, app_root, form_number, dry_run=False):
+  """其他写入入口只失效旧需求，不从不完整回执补造插件契约。"""
+  if dry_run or command not in _REPORT_STATE_WRITES or not app_root or not form_number:
+    return result
+  data = result.get("data") if isinstance(result, dict) else None
+  if isinstance(data, dict) and data.get("reportAuthoringState"):
+    return result
+  applied = _serve_result_success(result) or (isinstance(data, dict) and data.get("platformMutationApplied") is True)
+  possible = isinstance(data, dict) and data.get("platformMutationPossible") is True
+  if not applied and not possible:
+    return result
+  evidence = {"platformMutationApplied": True} if applied else {"platformMutationPossible": True}
+  try:
+    state = invalidate_report_authoring_state(app_root, form_number,
+      f"{command} crossed the report write boundary; reconcile the complete artifact before coding; do not replay the write",
+      mutation_applied=True if applied else None)
+  except (OSError, ValueError) as exc:
+    state = {"status": "failed", "errorType": type(exc).__name__, **evidence,
+      "reason": "Repair local state; do not replay the platform write"}
+  if isinstance(result, dict):
+    if not isinstance(data, dict):
+      result["data"] = data = {}
+    data["reportAuthoringState"] = state
   return result
 
 
+def _report_mutation_failure(exc):
+  """只接收报表写入边界异常，输入或身份预检失败不会触发失效。"""
+  code, message = _exception_error_code(exc)
+  return {"status": False, "errorCode": code, "message": message, "writeAttempted": True,
+          "data": {**({"platformMutationApplied": True} if exc.mutation_applied is True else
+                      {"platformMutationPossible": True}),
+                   "runtimeVerified": False, "retryAdvice": "Re-read and reconcile; do not replay the write"}}
+
+
 def _json_diff_paths(before, after, path=""):
   """Return exact JSON Pointer leaf/subtree paths changed by a replacement."""
   if type(before) is not type(after):
@@ -2929,12 +3043,12 @@ from _core.formatters import (           # noqa: F401
   _print_forms, _print_schema, _print_templates,
   _print_form_layout_tree, _print_panels,
   _print_find_results, _print_biz_hierarchy,
-  pjson, _transform_build_meta_result, save_run_batch_result,
+  pjson, _transform_build_meta_result, save_run_batch_result, result_summary,
   set_output_file, set_stdout_mode, set_current_command, _is_en,
 )
 
 
-from execution_binding import execution_binding, validate_execution_binding
+from execution_binding import execution_binding, validate_execution_binding, bound_entrypoint
 from _core.execution_errors import attach_execution_error
 
 _FORMATTER_PJSON = pjson
@@ -3034,6 +3148,10 @@ def _is_machine_failure(result):
 def pjson(obj, force_stdout=False):
   """Emit one structured result and make semantic failure affect the exit code."""
   global _CLI_RESULT_EMITTED
+  if _CLI_DELIVERY_ARGS is not None:
+    obj = _invalidate_unmerged_report_state(obj, getattr(_CLI_DELIVERY_ARGS, "cmd", None),
+      getattr(_CLI_DELIVERY_ARGS, "app_root", None), getattr(_CLI_DELIVERY_ARGS, "formNumber", None),
+      getattr(_CLI_DELIVERY_ARGS, "dry_run", False))
   obj = attach_execution_error(_attach_verified_form_delivery(obj, _CLI_DELIVERY_ARGS))
   _FORMATTER_PJSON(obj, force_stdout=force_stdout)
   _CLI_RESULT_EMITTED = True
@@ -3072,20 +3190,21 @@ def _exception_error_code(exc):
   return "CLI_EXECUTION_ERROR", text or exc.__class__.__name__
 
 
-def _emit_machine_error(error_code, message, recovery=None):
+def _emit_machine_error(error_code, message, recovery=None, data=None):
   global _CLI_RESULT_EMITTED
   _FORMATTER_PJSON(
     {
       "status": False,
       "errorCode": str(error_code or "CLI_EXECUTION_ERROR"),
       "message": str(message or "Command failed"),
-      "data": None,
+      "data": data,
       "errorCategory": attach_execution_error({"status": False, "errorCode": error_code})["errorCategory"],
       "capabilityLimitConfirmed": error_code == "FULL_METADATA_API_UNAVAILABLE",
       "executionBinding": execution_binding(),
       **({"writeAttempted": False} if error_code in {
         "SKILL_SOURCE_MISMATCH", "SKILL_REVISION_MISMATCH", "ENVIRONMENT_BINDING_MISMATCH",
         "CONDITIONAL_CARRY_SOURCE_PROPERTY_UNAVAILABLE",
+        "REPORT_SORTS_API_UNSAFE",
       } else {}),
       **({"recovery": recovery} if recovery else {}),
     },
@@ -3100,8 +3219,12 @@ from _core.reset import (              # noqa: F401
 )
 
 from _core.report_ops import (           # noqa: F401
+  ReportMutationError,
   set_report_columns as do_set_report_columns,
   add_report_columns as do_add_report_columns,
+  remove_report_column as do_remove_report_column,
+  normalize_report_column_removal_input,
+  plan_report_column_removal,
   plan_report_column_append,
   set_report_filters as do_set_report_filters,
   set_report_sorts as do_set_report_sorts,
@@ -3122,6 +3245,7 @@ from _core.report_ops import (           # noqa: F401
   normalize_report_properties_artifact,
   report_properties_artifact_summary,
   report_readback_verification,
+  resolve_filter_editors,
   validate_report_references,
   assert_report_filter_keys_free,
   collect_report_column_keys,
@@ -3129,7 +3253,12 @@ from _core.report_ops import (           # noqa: F401
   attach_dym_evidence,
   filters_need_dym_evidence,
   compile_report_plugin_contract,
+  compile_report_default_sorts,
+  REPORT_SORTS_API_UNSAFE,
   write_report_plugin_contract,
+  write_report_authoring_state,
+  sync_report_authoring_state,
+  invalidate_report_authoring_state,
   plan_report_recreate,
   write_report_recreate_backup,
 )
@@ -3325,6 +3454,15 @@ def _verify_listcolumn_landed(cfg, token, form_id, field_key, result):
 # ─── Serve mode ─────────────────────────────────────────────────────────────────
 
 def _dispatch_serve(cfg, token, cmd, cmd_args):
+  try:
+    result = _dispatch_serve_command(cfg, token, cmd, cmd_args)
+  except ReportMutationError as exc:
+    result = _report_mutation_failure(exc)
+  return _invalidate_unmerged_report_state(result, cmd, cmd_args.get("appRoot"),
+    cmd_args.get("formNumber"), cmd_args.get("dryRun", False))
+
+
+def _dispatch_serve_command(cfg, token, cmd, cmd_args):
   """Dispatch commands in serve mode to corresponding business functions.
 
   Args:
@@ -4342,7 +4480,7 @@ def _dispatch_serve(cfg, token, cmd, cmd_args):
       form_name=cmd_args.get("formName") or cmd_args.get("form_name"),
       field_name=cmd_args.get("fieldName") or cmd_args.get("field_name"),
       biz_word=cmd_args.get("bizWord") or cmd_args.get("biz_word"),
-      field_type=cmd_args.get("fieldType") or cmd_args.get("field_type") or "TextField",
+      field_type=cmd_args.get("fieldType") or cmd_args.get("field_type"),
       app_root=cmd_args.get("appRoot") or cmd_args.get("app_root"),
       project_root=cmd_args.get("projectRoot") or cmd_args.get("project_root"),
       app_name=cmd_args.get("appName") or cmd_args.get("app_name"),
@@ -4395,7 +4533,7 @@ def _dispatch_serve(cfg, token, cmd, cmd_args):
       form_name=cmd_args.get("formName") or cmd_args.get("form_name"),
       field_name=cmd_args.get("fieldName") or cmd_args.get("field_name"),
       biz_word=cmd_args.get("bizWord") or cmd_args.get("biz_word"),
-      field_type=cmd_args.get("fieldType") or cmd_args.get("field_type") or "TextField",
+      field_type=cmd_args.get("fieldType") or cmd_args.get("field_type"),
       app_root=cmd_args.get("appRoot") or cmd_args.get("app_root"),
       project_root=cmd_args.get("projectRoot") or cmd_args.get("project_root"),
       app_name=cmd_args.get("appName") or cmd_args.get("app_name"),
@@ -4534,6 +4672,15 @@ def _dispatch_serve(cfg, token, cmd, cmd_args):
       form_number=cmd_args.get("formNumber"),
     )
 
+  elif cmd == "removeReportColumn":
+    from types import SimpleNamespace
+    if not isinstance(cmd_args.get("dryRun", False), bool):
+      raise ValueError("REPORT_INPUT_INVALID: dryRun must be boolean")
+    return _remove_owned_report_column(cfg, token, SimpleNamespace(
+      app_root=cmd_args.get("appRoot"), formNumber=cmd_args.get("formNumber"),
+      formId=cmd_args.get("formId"), fieldKey=cmd_args.get("fieldKey"),
+      dry_run=cmd_args.get("dryRun", False)))
+
   elif cmd == "setReportFilters":
     filters = normalize_report_filters_input(_load_json_arg(cmd_args.get("filters", [])))
     return do_set_report_filters(
@@ -4545,14 +4692,8 @@ def _dispatch_serve(cfg, token, cmd, cmd_args):
     )
 
   elif cmd == "setReportSorts":
-    sorts = normalize_report_sorts_input(_load_json_arg(cmd_args.get("sorts", [])))
-    return do_set_report_sorts(
-      cfg, token,
-      form_id=cmd_args.get("formId"),
-      sorts=sorts,
-      dry_run=cmd_args.get("dryRun", False),
-      form_number=cmd_args.get("formNumber"),
-    )
+    normalize_report_sorts_input(_load_json_arg(cmd_args.get("sorts", [])))
+    raise RuntimeError(REPORT_SORTS_API_UNSAFE)
 
   elif cmd == "registerReportPlugin":
     plugin = normalize_report_plugin_input(_load_json_arg(cmd_args.get("plugin", {})))
@@ -4979,8 +5120,7 @@ def _serve_loop(cfg):
 
 
 # ─── Report Pipeline ─────────────────────────────────────────────────────────
-# Orchestrates the full report creation flow: createPage → setReportColumns →
-# setReportFilters → setReportSorts → registerReportPlugin ×N
+# 创建流水线保留七步依赖顺序；默认排序仅进入 Java 契约，不写入 InitField。
 #
 # Report data sources are hidden in the Cosmic designer and are no longer written here.
 # A report gets its rows from the data-fetch plugin's query(ReportQueryParam, Object).
@@ -5042,9 +5182,13 @@ def _settle_report_property_design_state(cfg, token, result, form_number, app_ro
     print(f"[{command}] could not sync design-state evidence: {exc}",
        file=sys.stderr, flush=True)
     return
-  attach_report_property_design_state(
-    result, evidence_path,
-    expectation["hostType"], expectation["expected"])
+  try:
+    attach_report_property_design_state(
+      result, evidence_path,
+      expectation["hostType"], expectation["expected"])
+  except Exception as exc:
+    # 此处只有写成功后才会进入，设计证据失败不能丢失该边界。
+    raise ReportMutationError(str(exc), mutation_applied=True) from exc
 
 
 def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_root=None):
@@ -5055,7 +5199,7 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     2. setReportQueryDataSource (if a query data source is declared)
     3. setReportColumns
     4. setReportFilters (if any)
-    5. setReportSorts (if any)
+    5. preserve default sorts for the Java query contract (no metadata write)
     6. registerReportPlugin for each plugin (if any)
     7. apply reportProperties (if any), LAST so it settles ShowFilterFields after step 4
 
@@ -5104,6 +5248,10 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     normalize_report_plugin_input(item)
     for item in (artifact.get("reportPlugins") or [])
   ]
+  # 创建前确认排序引用和承接插件；不能创建后才发现需求没有实现通道。
+  default_sorts = compile_report_default_sorts({
+    "reportSorts": sorts, "reportColumns": columns, "reportPlugins": plugins,
+  })
   if artifact.get("reportBehavior"):
     raise ValueError(
       "REPORT_INPUT_INVALID: reportBehavior is not a published typed CLI capability"
@@ -5182,20 +5330,21 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     print("[report-pipeline] Step 3/7: no reportColumns (skipped)", file=sys.stderr, flush=True)
 
   # Step 4: setReportFilters
+  # The outcome records what the platform did with each typed filter editor: a platform without
+  # the typed report filter patch renders the legacy control, which is reported, not failed.
+  filter_editor_outcome = {}
   if filters:
     print(f"[report-pipeline] Step 4/7: setReportFilters ({len(filters)} filters)",
        file=sys.stderr, flush=True)
-    do_set_report_filters(cfg, token, form_id=form_id, filters=filters)
+    do_set_report_filters(cfg, token, form_id=form_id, filters=filters,
+                          outcome=filter_editor_outcome)
   else:
     print("[report-pipeline] Step 4/7: no reportFilters (skipped)", file=sys.stderr, flush=True)
 
-  # Step 5: setReportSorts
+  # 第五步仅保留插件排序契约，绝不调用会污染 InitField 的 ReportSorts。
   if sorts:
-    print(f"[report-pipeline] Step 5/7: setReportSorts ({len(sorts)} sort rules)",
-       file=sys.stderr, flush=True)
-    validate_report_references(
-      "sorts", sorts, do_get_report_schema(cfg, token, form_id=form_id))
-    do_set_report_sorts(cfg, token, form_id=form_id, sorts=sorts)
+    print(f"[report-pipeline] Step 5/7: default sorts -> Java query contract "
+          f"({len(default_sorts)} rules; runtime unverified)", file=sys.stderr, flush=True)
   else:
     print("[report-pipeline] Step 5/7: no reportSorts (skipped)", file=sys.stderr, flush=True)
 
@@ -5210,9 +5359,11 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     print("[report-pipeline] Step 6/7: no reportPlugins (skipped)", file=sys.stderr, flush=True)
 
   # Step 7: reportProperties
-  # Last on purpose. setReportFilters writes ShowFilterFields as a comma-joined string the
-  # runtime cannot parse, so applying the property section afterwards is what leaves a
-  # freshly created report with the JSON-array form. Every write here verifies itself.
+  # Last on purpose. A platform without the typed report filter patch has setReportFilters
+  # write ShowFilterFields as a comma-joined string the runtime cannot parse, and a patched one
+  # resets FilterMustInput and the initial filter fields from the filters, so applying the
+  # property section afterwards is what leaves a freshly created report with what it declared.
+  # Every write here verifies itself.
   property_results = []
   if property_plan:
     _prop_number = str(
@@ -5258,15 +5409,10 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
        file=sys.stderr, flush=True)
 
   final_schema = do_get_report_schema(cfg, token, form_id=form_id)
-  # Sorts and plugins are absent from formLayout, so on a deployment without a canonical
-  # projection they had no observable read-back at all. The platform's own design-state
-  # export does carry them: sync it now — after every write, before verification — so the
-  # file on disk cannot be older than what it is being used to prove.
-  # The same export also proves the filter properties the API projection cannot decide, so a
-  # report with a required filter needs it even when it declares no sorts and no plugin.
+  # 设计态导出只补充插件和过滤属性证据，不证明排序。所有写入后同步，避免使用旧文件。
   _pending_dym_sections = [
     section for section in (final_schema.get("unverifiableSections") or [])
-    if (section == "reportSorts" and sorts) or (section == "reportPlugins" and plugins)
+    if section == "reportPlugins" and plugins
   ]
   if app_root and (_pending_dym_sections or filters_need_dym_evidence(filters)):
     _dym_number = str(final_schema.get("formNumber") or form_number or "").strip()
@@ -5291,12 +5437,13 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     if columns:
       checks.append(report_readback_verification("columns", columns, final_schema))
     if filters:
-      if any(item.get("source") for item in filters):
-        from _core.report_ops import report_filter_source_expectations
-        final_schema["filterSourceExpectations"] = report_filter_source_expectations(cfg, token, filters)
-      checks.append(report_readback_verification("filters", filters, final_schema))
-    if sorts and "reportSorts" not in unverifiable:
-      checks.append(report_readback_verification("sorts", sorts, final_schema))
+      if filter_editor_outcome:
+        final_schema["filterEditorOutcome"] = filter_editor_outcome
+      filter_check = report_readback_verification("filters", filters, final_schema)
+      checks.append(filter_check)
+      if filter_check.get("filterEditors"):
+        filter_editor_outcome = filter_check["filterEditors"]
+    # 默认排序由 query() 实现，不纳入元数据回读通过项。
     if "reportPlugins" not in unverifiable:
       for plugin in plugins:
         checks.append(report_readback_verification("plugin", plugin, final_schema))
@@ -5326,6 +5473,15 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     print("[report-pipeline] no report read-back available on this deployment; "
           "section writes succeeded but were not independently re-read",
           file=sys.stderr, flush=True)
+    # The platform's own filter receipt is still evidence: an editor it reported as neither the
+    # requested one nor the legacy one fails the run even without a read-back.
+    if filter_editor_outcome.get("typedFilterSupport") == "mismatch":
+      _editors, _receipt_mismatches = resolve_filter_editors(filter_editor_outcome, [])
+      failed_checks = [{
+        "section": "reportFilters", "source": "receipt", "verified": False,
+        "mismatches": _receipt_mismatches, "filterEditors": _editors,
+      }]
+      checks = list(failed_checks)
 
   # createPage adds the ISV prefix, so reconcile form_number to the authoritative
   # value read back by formId (keeps archive/formNumbers/syncDym pointing at the real form).
@@ -5357,8 +5513,26 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
     "readBackSource": read_back_source,
     "verification": {"verified": verification_verified, "checks": checks},
   }
+  if default_sorts:
+    summary["reportDefaultSorts"] = {
+      "implementation": "reportlist.query", "requirements": default_sorts,
+      "status": "pendingJavaImplementation", "metadataWritten": False, "runtimeVerified": False,
+    }
   if query_data_source_result:
     summary["queryDataSource"] = query_data_source_result
+  if filter_editor_outcome and any(
+      row.get("requestedFieldType") for row in filter_editor_outcome.get("editors") or []):
+    # Which editor each typed filter actually got. prepare_plugin_handoff forwards it to the
+    # plugin contract, and a degraded filter is an unresolved boundary the reply must name.
+    summary["reportFilterEditors"] = {**filter_editor_outcome, "formNumber": form_number}
+    if filter_editor_outcome.get("typedFilterSupport") not in ("available", "notRequested"):
+      print(
+        "[report-pipeline] typed filter editors: "
+        f"{filter_editor_outcome.get('typedFilterSupport')}; degraded "
+        f"{filter_editor_outcome.get('degradedFilters') or []} render the legacy control until "
+        "the platform's typed report filter patch is installed and the filters are re-applied",
+        file=sys.stderr, flush=True,
+      )
   if property_plan:
     # Each property write verified itself, so what the summary carries is which of them could
     # be proven and which resolve on no read path this pipeline owns.
@@ -5383,9 +5557,10 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
   _plugin_contract = (
     None if (query_data_source and not plugins)
     else compile_report_plugin_contract(
-      {"reportColumns": columns, "reportFilters": filters, "reportPlugins": plugins,
-       "reportProperties": artifact.get("reportProperties") or {}},
+      {"reportColumns": columns, "reportFilters": filters, "reportSorts": sorts,
+       "reportPlugins": plugins, "reportProperties": artifact.get("reportProperties") or {}},
       form_number,
+      filter_editors=filter_editor_outcome or None,
     )
   )
   if _plugin_contract:
@@ -5393,6 +5568,7 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
       "dataSetColumnTypes": len(_plugin_contract["dataSetColumnTypes"]),
       "columnPresentation": len(_plugin_contract["columnPresentation"]),
       "filterEnforcement": len(_plugin_contract["filterEnforcement"]),
+      "defaultSorts": len(_plugin_contract["defaultSorts"]),
     }
     if app_root:
       try:
@@ -5410,6 +5586,16 @@ def _execute_report_pipeline(cfg, token, artifact, biz_app_id, biz_unit_id, app_
       file=sys.stderr, flush=True,
     )
 
+  if app_root and verification_verified and not failed_checks:
+    try:
+      summary["reportAuthoringState"] = write_report_authoring_state(
+        app_root, form_number, form_id,
+        {**artifact, "reportColumns": columns, "reportFilters": filters, "reportPlugins": plugins},
+        final_schema, filter_editor_outcome or None)
+    except (OSError, ValueError) as exc:
+      summary["reportAuthoringState"] = {"status": "failed", "errorType": type(exc).__name__,
+        "platformMutationApplied": True, "reason": "Repair local state; do not recreate the report"}
+
   # Java plugin delivery consumes this result through
   # prepare_plugin_handoff.py --run-result, so persist it at a stable path instead of
   # relying on pjson's size threshold (a small report summary never reached disk).
@@ -5468,6 +5654,7 @@ _CATALOG_PAYLOAD_SCHEMA_REFS = {
   "createScript": "skills/cosmic-meta-api/contracts/schema/script-create.schema.json",
   "setReportColumns": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/columns",
   "addReportColumns": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/columns",
+  "removeReportColumn": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/columnRemoval",
   "setReportFilters": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/filters",
   "setReportSorts": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/sorts",
   "registerReportPlugin": "skills/cosmic-meta-api/contracts/schema/report-write.schema.json#/$defs/plugin",
@@ -5537,6 +5724,7 @@ _CATALOG_COMMAND_CONTRACT_REFS = {
   "setSummaryToField": "skills/cosmic-meta-api/contracts/cli/rule-domain.json#commands/setSummaryToField",
   "setReportColumns": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/setReportColumns",
   "addReportColumns": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/addReportColumns",
+  "removeReportColumn": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/removeReportColumn",
   "setReportFilters": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/setReportFilters",
   "setReportSorts": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/setReportSorts",
   "registerReportPlugin": "skills/cosmic-meta-api/contracts/cli/report-write-contracts.json#commands/registerReportPlugin",
@@ -5616,11 +5804,12 @@ _CATALOG_COMMANDS_BY_EFFECT = {
   }),
   "destructive": frozenset({
     "deleteApp", "deleteForm", "deleteMenu", "deleteOperation", "deleteOperationValidation", "deletePlugin",
-    "deleteRule", "deleteUnit", "removeContainer", "removeField", "removeFilterColumn",
+    "deleteRule", "deleteUnit", "removeContainer", "removeField", "removeFilterColumn", "removeReportColumn",
   }),
 }
 _CATALOG_RISK_OVERRIDES = {
   "cleanTemp": "medium",
+  "removeReportColumn": "high",
   # the only setter whose blast radius is an entire form: an unmodified round trip
   # silently changed the resolved Features of 17 fields
   "saveFullMetadata": "high",
@@ -5645,6 +5834,11 @@ _CATALOG_UNAVAILABLE_COMMANDS = {
   # 404 came from calling dedicated endpoints that were never supposed to exist.
   # Both now route through setComplexProperty with the complexType the backend
   # actually dispatches on (filter / permissionControl), so they are available again.
+  "setReportSorts": {
+    "availability": "blocked",
+    "availabilityReason": REPORT_SORTS_API_UNSAFE,
+    "replacedBy": "Java reportlist query() via reportContract.defaultSorts",
+  },
   "setComboItems": {
     "availability": "deprecated",
     "availabilityReason": (
@@ -5724,15 +5918,26 @@ _CATALOG_ARGUMENT_CONSTRAINTS = {
       "column is skipped, so repeating the call is idempotent"
     ),
   }],
+  "removeReportColumn": [{
+    "kind": "target_binding",
+    "arguments": ["app_root", "formNumber", "fieldKey"],
+    "identity": "exact leaf fieldKey",
+    "message": "Deletes one leaf through ReportColumns.remove, verifies the remaining tree, and refreshes complete authoring when possible. Backend patch required; unavailable fails closed, never hides or rebuilds. Unknown outcomes must not be replayed; Java and entity cleanup remain separate evidence boundaries.",
+  }],
   "setReportFilters": [{
     "kind": "full_replacement",
     "arguments": ["app_root", "formNumber", "filters"],
-    "message": "filters is the complete desired report filter state; CLI performs independent read-back",
+    "message": (
+      "filters is the complete desired report filter state; a filter may declare fieldType "
+      "with its parameters for a native editor, and the result's filterEditors says which "
+      "editor each filter rendered (a platform without the typed filter patch renders the "
+      "legacy control). CLI performs independent read-back"
+    ),
   }],
   "setReportSorts": [{
-    "kind": "replacement",
+    "kind": "blocked",
     "arguments": ["app_root", "formNumber", "sorts"],
-    "message": "sorts replaces report-owned default sort entries and is independently read back",
+    "message": "REPORT_SORTS_API_UNSAFE: no metadata write; preserve reportSorts in the Java query contract",
   }],
   "registerReportPlugin": [{
     "kind": "upsert",
@@ -5767,8 +5972,7 @@ _CATALOG_ARGUMENT_CONSTRAINTS = {
       "target": "templateNumber",
       "sources": ["template", "artifact.templateNumber", "emitManifest.templateNumber"],
       "message": (
-        "templateNumber has no implicit default; an explicit blank is accepted only "
-        "for a MainEntity dynamic form"
+        "templateNumber has no implicit default; use blankPage for an explicit blank BillEntity, or empty for a MainEntity dynamic form"
       ),
     },
     {
@@ -5791,8 +5995,7 @@ _CATALOG_ARGUMENT_CONSTRAINTS = {
       "target": "templateNumber",
       "sources": ["template", "artifact.templateNumber", "emitManifest.templateNumber"],
       "message": (
-        "no implicit default: every artifact needs an explicit templateNumber; blank is accepted only "
-        "for a MainEntity dynamic form"
+        "no implicit default: every artifact needs an explicit templateNumber; blankPage supports BillEntity, empty supports MainEntity"
       ),
     },
     {
@@ -6044,7 +6247,7 @@ _CATALOG_ARGUMENT_CONSTRAINTS = {
       "argument": "field_type",
       "selectionOwner": "model",
       "contractRef": "skills/cosmic-meta-knowledge/domain-model/field-types.md",
-      "message": "choose one documented FieldDataType; the CLI rejects invented types before auth or writes",
+      "message": "select the exact documented FieldDataType from business meaning and pass it explicitly for every new field; there is no default field type",
     },
     {
       "kind": "conditional_parameters",
@@ -6619,6 +6822,7 @@ def _main_impl():
            help="One or more artifact file paths (space-separated); when omitted, from --app-root _emit_manifest.json auto-collected")
   prb.add_argument("--app-root", default=None, dest="app_root",
            help="Working directory; when provided, auto-fills --bizAppId / --bizUnitId / --artifacts / --template")
+  prb.add_argument("--compact", action="store_true", help="Return verification and continuation evidence; keep the full receipt at resultPath")
   prb.add_argument("--app-code", "--appCode", default=None, dest="app_code",
            help="Exact existing application code; verifies and synchronizes a trusted appRoot identity before any build write")
   prb.add_argument("--emit-manifest", default=None, dest="emit_manifest",
@@ -6835,7 +7039,7 @@ def _main_impl():
   paf.add_argument("--biz-word", dest="biz_word",
                    help="Concise semantic English business word without ISV prefix")
   paf.add_argument(
-    "--field-type", default="TextField", dest="field_type",
+    "--field-type", default=None, dest="field_type",
     choices=field_type_choices(),
     help="Exact FieldDataType selected from the authoritative field-types contract"
   )
@@ -6963,8 +7167,8 @@ def _main_impl():
                     help="New field display name")
   pasf.add_argument("--biz-word", required=True, dest="biz_word",
                     help="Concise semantic English business word without ISV prefix")
-  pasf.add_argument("--field-type", default="TextField", dest="field_type",
-                    help="Platform field type (default TextField)")
+  pasf.add_argument("--field-type", default=None, dest="field_type",
+                    help="Exact platform field type selected from business semantics")
   pasf.add_argument("--app-root", default=None, dest="app_root",
                     help="Already verified app root")
   pasf.add_argument("--project-root", default=None, dest="project_root",
@@ -7476,7 +7680,7 @@ def _main_impl():
   p_eccv.add_argument("--condition-field", dest="condition_field")
   p_eccv.add_argument(
     "--operator",
-    choices=["equals", "not-equals", "greater-than", "greater-or-equal", "less-than", "less-or-equal"])
+    choices=["equals", "not-equals", "greater-than", "greater-or-equal", "less-than", "less-or-equal", "empty", "not-empty"])
   p_eccv.add_argument("--value")
   p_eccv.add_argument("--source", help="Source field key or caption")
   p_eccv.add_argument("--target", help="Target field key or caption")
@@ -8533,6 +8737,14 @@ def _main_impl():
   p_arc.add_argument("--app-root", required=True, dest="app_root",
             help="Owned application root used to prove the exact report target")
 
+  p_rrc = sub.add_parser("removeReportColumn",
+    help="Remove one report leaf column (requires backend deletion patch; no automatic fallback)")
+  p_rrc.add_argument("--formNumber", required=True, help="Exact report form number")
+  p_rrc.add_argument("--formId", default=None, help="Optional exact form ID; mismatch fails closed")
+  p_rrc.add_argument("--fieldKey", required=True, help="Exact leaf column key, including a nested leaf")
+  p_rrc.add_argument("--app-root", required=True, dest="app_root", help="Owned application root")
+  p_rrc.add_argument("--dryRun", action="store_true", dest="dry_run", help="Local payload only; does not prove backend support")
+
   p_srf = sub.add_parser("setReportFilters",
     help="Set report filter fields")
   p_srf.add_argument("--formNumber", required=True, help="Exact report form number")
@@ -8545,13 +8757,13 @@ def _main_impl():
             help="Owned application root used to prove the exact report target")
 
   p_srs = sub.add_parser("setReportSorts",
-    help="Set report sort configuration")
+    help="Blocked unsafe metadata sorting; use the Java query contract")
   p_srs.add_argument("--formNumber", required=True, help="Exact report form number")
   p_srs.add_argument("--formId", default=None, help="Optional exact report form ID; mismatch fails closed")
   p_srs.add_argument("--sorts", required=True,
             help="Report sorts JSON file path or inline JSON string")
   p_srs.add_argument("--dryRun", action="store_true", dest="dry_run",
-            help="Only output payload, do not submit")
+            help="兼容旧参数；同样拒绝危险排序写入，不输出可执行 payload")
   p_srs.add_argument("--app-root", required=True, dest="app_root",
             help="Owned application root used to prove the exact report target")
 
@@ -8590,8 +8802,9 @@ def _main_impl():
                  "moreFilterPanel=ReportMoreFilterPanelAp, form=ReportFormAp (root), "
                  "tree=ReportTreeAp, column=one report column or column group")
   p_srp.add_argument("--element", default=None, dest="element_key",
-            help="Exact report column or column group key; required for --target column "
-                 "and refused for every other target")
+            help="Exact report column or column group key; required for --target column, "
+                 "optional for --target tree to pick one of several ReportTreeAp controls "
+                 "(found by type otherwise), and refused for every other target")
   p_srp.add_argument("--input", required=True, dest="input_file",
             help="Property map as JSON or @file, e.g. '{\"ShowSeq\": false, \"PageRows\": 500}'")
   p_srp.add_argument("--dryRun", action="store_true", dest="dry_run",
@@ -9217,10 +9430,12 @@ def _main_impl():
   set_stdout_mode(bool(args.stdout))
   if (args.stdout or args.output_file) and hasattr(args, "raw_json"):
     args.raw_json = True
-  if args.stdout and args.cmd != "serve":
-    _route_unstructured_prints_to_stderr()
+  # 进程级日志路由由 main 独占并恢复，内部执行函数不改写 builtins.print。
   app_root = _resolve_app_root_arg(args)
   if app_root:
+    selected = bound_entrypoint(app_root, "skills/cosmic-meta-api/scripts/cosmic_api.py")
+    if selected:
+      return subprocess.call([sys.executable, str(selected), *sys.argv[1:]])
     validate_execution_binding(app_root)
     _retarget_runtime_dir(app_root)
 
@@ -9263,7 +9478,7 @@ def _main_impl():
     args.fields = _load_json_arg(args.fields)
     if args.biz_word is not None or args.combo is not None or args.combo_json is not None:
       raise _CliUsageError("--fields carries each field specification; do not combine single-field specifications")
-    if args.field_type != "TextField" or args.required or any(getattr(args, name, None) for name in (
+    if args.field_type is not None or args.required or any(getattr(args, name, None) for name in (
         "basedata", "ref_bill", "mul_table", "unit_field", "flex_type", "ref_base_field", "ref_display_prop", "asstTypeId", "asst_type", "extAppId")):
       raise _CliUsageError("--fields carries reference/type options on each item; do not combine single-field or selected-extension flags")
     validate_add_fields_input(args.fields)
@@ -9330,10 +9545,13 @@ def _main_impl():
   # before resolving a platform target so malformed JSON can never cause a write.
   if args.cmd in ("setReportColumns", "addReportColumns"):
     args._report_payload = normalize_report_columns_input(_load_json_arg(args.columns))
+  elif args.cmd == "removeReportColumn":
+    args.fieldKey = normalize_report_column_removal_input({"fieldKey": args.fieldKey})["fieldKey"]
   elif args.cmd == "setReportFilters":
     args._report_payload = normalize_report_filters_input(_load_json_arg(args.filters))
   elif args.cmd == "setReportSorts":
-    args._report_payload = normalize_report_sorts_input(_load_json_arg(args.sorts))
+    normalize_report_sorts_input(_load_json_arg(args.sorts))
+    raise RuntimeError(REPORT_SORTS_API_UNSAFE)
   elif args.cmd == "registerReportPlugin":
     args._report_payload = normalize_report_plugin_input(_load_json_arg(args.plugin))
 
@@ -9528,10 +9746,9 @@ def _main_impl():
           file=sys.stderr,
         )
         sys.exit(2)
-      if _tpl == "" and not _artifact_supports_blank_template(raw_artifact):
+      if _tpl in {"", "blankPage"} and not _artifact_supports_blank_template(raw_artifact, _tpl):
         print(
-          "⛔ run: 空 templateNumber 仅适用于 MainEntity 动态表单；"
-          "BillEntity/BaseEntity 必须提供真实模板编码。",
+          "⛔ run: 空 templateNumber 仅适用于 MainEntity；BillEntity 显式空白创建请使用 blankPage。",
           file=sys.stderr,
         )
         sys.exit(2)
@@ -9821,11 +10038,11 @@ def _main_impl():
       invalid_blank_tpl = [
         os.path.basename(p)
         for p, t in tpl_per_artifact.items()
-        if t == "" and not _artifact_file_supports_blank_template(p)
+        if t in {"", "blankPage"} and not _artifact_file_supports_blank_template(p, t)
       ]
       if invalid_blank_tpl:
         print(
-          "⛔ runBatch: 空 templateNumber 仅适用于 MainEntity 动态表单："
+          "⛔ runBatch: 空模板仅支持 MainEntity 或显式 blankPage 的 BillEntity："
           + ", ".join(invalid_blank_tpl),
           file=sys.stderr,
         )
@@ -10744,7 +10961,7 @@ def _main_impl():
           if not final_ok and phase != "buildMeta" and not summary_one.get("errorCode"):
             _attach_post_build_phase_failure(
               summary_one, transformed, phase=phase, app_root=app_root,
-              artifact_path=afile, pending_write=pending_write,
+              artifact_path=afile, pending_write=pending_write, verification=verification,
             )
           _apply_build_failure_contract(transformed, summary_one)
           return {
@@ -10917,7 +11134,7 @@ def _main_impl():
         _atomic_json(progress.result_path, summary)
       elif app_root:
         summary = save_run_batch_result(summary, app_root, artifact_files)
-      pjson(summary)
+      pjson(result_summary(summary, summary["resultPath"]) if args.compact and summary.get("resultPath") else summary)
       if args.verify:
         verified = sum(
           1 for item in results
@@ -11750,8 +11967,12 @@ def _main_impl():
         raise _CliUsageError("use --input for several mappings, or --source/--target for one mapping")
       if args.input_file and args.only_empty_target:
         raise _CliUsageError("with --input put per-row onlyEmptyTarget inside mappings")
-      if not args.input_file and not all((args.condition_field, args.operator, args.value, args.source, args.target)):
-        raise _CliUsageError("single mapping requires condition-field, operator, value, source and target")
+      if not args.input_file and not all((args.condition_field, args.operator, args.source, args.target)):
+        raise _CliUsageError("single mapping requires condition-field, operator, source and target")
+      if not args.input_file and args.operator not in {"empty", "not-empty"} and not args.value:
+        raise _CliUsageError("comparison operator requires a value")
+      if not args.input_file and args.operator in {"empty", "not-empty"} and args.value not in (None, ""):
+        raise _CliUsageError("empty and not-empty do not accept a value")
       token = do_auth(cfg)
       blocked = _bind_rule_domain_target(cfg, token, args, args.cmd)
       if blocked is not None:
@@ -13663,7 +13884,8 @@ def _main_impl():
         form_number=args.formNumber)
       pjson(_attach_report_readback(
         cfg, token, form_id, "columns", columns,
-        {"formId": form_id, "formNumber": args.formNumber, "columnIds": column_ids}))
+        {"formId": form_id, "formNumber": args.formNumber, "columnIds": column_ids},
+        app_root=args.app_root, schema_before=schema_before))
 
     elif args.cmd == "addReportColumns":
       columns = args._report_payload
@@ -13685,7 +13907,12 @@ def _main_impl():
         {"before": schema_before.get("reportColumns") or [], "requested": columns},
         {"formId": form_id, "formNumber": args.formNumber,
          "plannedAppendFieldKeys": plan["plannedAppendFieldKeys"],
-         "preexistingFieldKeys": plan["preexistingFieldKeys"]}))
+         "preexistingFieldKeys": plan["preexistingFieldKeys"]},
+        app_root=args.app_root, schema_before=schema_before))
+
+    elif args.cmd == "removeReportColumn":
+      token = None if getattr(args, "dry_run", False) else do_auth(cfg)
+      pjson(_remove_owned_report_column(cfg, token, args))
 
     elif args.cmd == "setReportFilters":
       filters = args._report_payload
@@ -13700,32 +13927,17 @@ def _main_impl():
       schema_before = do_get_report_schema(cfg, token, form_id=form_id)
       bound_filters = validate_report_references(
         "filters", filters, schema_before)
+      filter_editors = {}
       filter_ids = do_set_report_filters(
         cfg, token, form_id=form_id, filters=bound_filters,
-        form_number=args.formNumber)
+        form_number=args.formNumber, outcome=filter_editors)
       pjson(_attach_report_readback(
         cfg, token, form_id, "filters", filters,
-        {"formId": form_id, "formNumber": args.formNumber, "filterIds": filter_ids}))
+        {"formId": form_id, "formNumber": args.formNumber, "filterIds": filter_ids},
+        filter_editors=filter_editors or None, app_root=args.app_root, schema_before=schema_before))
 
     elif args.cmd == "setReportSorts":
-      sorts = args._report_payload
-      if getattr(args, "dry_run", False):
-        pjson(do_set_report_sorts(
-          cfg, None, form_id=args.formId or "", sorts=sorts,
-          dry_run=True, form_number=args.formNumber))
-        return 0
-      token = do_auth(cfg)
-      target = _resolve_owned_report_target(cfg, token, args, args.cmd)
-      form_id = target["formId"]
-      schema_before = do_get_report_schema(cfg, token, form_id=form_id)
-      validate_report_references(
-        "sorts", sorts, schema_before)
-      do_set_report_sorts(
-        cfg, token, form_id=form_id, sorts=sorts,
-        form_number=args.formNumber)
-      pjson(_attach_report_readback(
-        cfg, token, form_id, "sorts", sorts,
-        {"formId": form_id, "formNumber": args.formNumber, "ok": True}))
+      raise RuntimeError(REPORT_SORTS_API_UNSAFE)
 
     elif args.cmd == "registerReportPlugin":
       plugin = args._report_payload
@@ -13737,12 +13949,14 @@ def _main_impl():
       token = do_auth(cfg)
       target = _resolve_owned_report_target(cfg, token, args, args.cmd)
       form_id = target["formId"]
+      schema_before = do_get_report_schema(cfg, token, form_id=form_id)
       plugin_id = do_register_report_plugin(
         cfg, token, form_id=form_id, plugin_spec=plugin,
         form_number=args.formNumber)
       pjson(_attach_report_readback(
         cfg, token, form_id, "plugin", plugin,
-        {"formId": form_id, "formNumber": args.formNumber, "pluginId": plugin_id}))
+        {"formId": form_id, "formNumber": args.formNumber, "pluginId": plugin_id},
+        app_root=args.app_root, schema_before=schema_before))
 
     elif args.cmd == "setReportQueryDataSource":
       if getattr(args, "dry_run", False):
@@ -13862,8 +14076,7 @@ def _main_impl():
       _prr_id = str(_prr_row.get("formId") or "").strip()
       _prr_schema = do_get_report_schema(cfg, token, form_id=_prr_id)
       _prr_number = str(_prr_schema.get("formNumber") or args.formNumber or "").strip()
-      # Design-state evidence makes the captured state complete: without it the backup would
-      # silently omit the sorts and plugins that have to be restored.
+      # 设计态导出补充插件证据；InitField 不证明排序，默认排序需求仍需完整 Artifact 对账。
       try:
         _prr_evidence = parse_report_dym(
           _export_report_dym_evidence(cfg, token, _prr_number, args.app_root)
@@ -13886,7 +14099,21 @@ def _main_impl():
       except Exception as exc:
         print(f"[planReportRecreate] could not read the application menu tree: {exc}",
            file=sys.stderr, flush=True)
-      _prr_plan = plan_report_recreate(_prr_schema, _prr_artifact, _prr_menus)
+      # deleteForm takes the plugins on the report form itself with it and run does not
+      # register them, so they are read now, while the form still exists.
+      _prr_plugin_rows = None
+      try:
+        _prr_plugin_result = do_query_editable_plugins(cfg, token, form_number=_prr_number)
+        if _is_api_success(_prr_plugin_result):
+          _prr_plugin_rows = _prr_plugin_result.get("data") or []
+        else:
+          print("[planReportRecreate] could not read the report form's plugins: "
+             f"{(_prr_plugin_result or {}).get('errorCode') or 'failed'}",
+             file=sys.stderr, flush=True)
+      except Exception as exc:
+        print(f"[planReportRecreate] could not read the report form's plugins: {exc}",
+           file=sys.stderr, flush=True)
+      _prr_plan = plan_report_recreate(_prr_schema, _prr_artifact, _prr_menus, _prr_plugin_rows)
       if not args.no_backup:
         _prr_plan["backupPath"] = write_report_recreate_backup(
           args.app_root, _prr_number, _prr_schema, _prr_plan)
@@ -14038,6 +14265,14 @@ def _resolve_form_id_for_schema(cfg, token, args):
 
 def main():
   global _CLI_MACHINE_MODE, _CLI_RESULT_EMITTED, _CLI_DELIVERY_ARGS
+  from _core import formatters
+  original_print = builtins.print
+  previous_cli = (_CLI_MACHINE_MODE, _CLI_RESULT_EMITTED, _CLI_DELIVERY_ARGS)
+  previous_output = (formatters._stdout_mode, formatters._output_file,
+                     formatters._current_cmd, formatters._current_arg_hash)
+  set_output_file(None)
+  set_current_command(None)
+  set_stdout_mode(False)
   _CLI_DELIVERY_ARGS = None
   sys.argv[1:] = _normalize_argv(sys.argv[1:])
   _CLI_MACHINE_MODE = "--stdout" in sys.argv[1:]
@@ -14069,12 +14304,23 @@ def main():
       _emit_machine_error("CLI_EXIT_ERROR", f"Command exited with code {code}")
     return code
   except Exception as exc:
+    failure = _report_mutation_failure(exc) if isinstance(exc, ReportMutationError) else None
+    if failure and _CLI_DELIVERY_ARGS is not None:
+      _invalidate_unmerged_report_state(failure, _CLI_DELIVERY_ARGS.cmd,
+        getattr(_CLI_DELIVERY_ARGS, "app_root", None), getattr(_CLI_DELIVERY_ARGS, "formNumber", None),
+        getattr(_CLI_DELIVERY_ARGS, "dry_run", False))
     if _CLI_MACHINE_MODE and not _CLI_RESULT_EMITTED:
       error_code, message = _exception_error_code(exc)
-      _emit_machine_error(error_code, message)
+      _emit_machine_error(error_code, message, data=failure["data"] if failure else None)
     else:
       print(f"[ERROR] {exc}", file=sys.stderr)
     return 1
+  finally:
+    # CLI 嵌入同一进程时，日志路由不能吞掉后续插件或卡片的 stdout。
+    builtins.print = original_print
+    (_CLI_MACHINE_MODE, _CLI_RESULT_EMITTED, _CLI_DELIVERY_ARGS) = previous_cli
+    (formatters._stdout_mode, formatters._output_file,
+     formatters._current_cmd, formatters._current_arg_hash) = previous_output
 
 
 if __name__ == "__main__":