@qingflow-tech/qingflow-cli 1.1.41 → 1.1.43-beta.1

package/src/qingflow_mcp/builder_facade/service.py

@@ -9191,6 +9191,7 @@ class AiBuilderFacade:
         remove_fields: list[FieldRemovePatch],
         inline_form_layout_sections: list[LayoutSectionPatch] | None = None,
     ) -> JSONObject:
+        # TODO(deprecation): Remove after all internal callers use the AppForm reconciler.
         apply_started_at = time.perf_counter()
         schema_write_ms: int | None = None
         inline_layout_ms: int | None = None
@@ -10182,6 +10183,7 @@ class AiBuilderFacade:
         sections: list[LayoutSectionPatch],
         publish: bool = True,
     ) -> JSONObject:
+        # TODO(deprecation): Remove after all internal callers use the AppForm reconciler.
         requested_sections = [section.model_dump(mode="json", exclude_none=True) for section in sections]
         normalized_args = {
             "app_key": app_key,
@@ -22236,7 +22238,7 @@ def _compile_code_block_binding_fields(
             alias_name = str(output_item.get("alias") or "").strip()
             alias_path = str(output_item.get("path") or "").strip()
             existing_alias = existing_alias_by_name.get(alias_name) or {}
-            alias_id = _coerce_positive_int(existing_alias.get("alias_id"))
+            alias_id = _coerce_positive_int(output_item.get("alias_id")) or _coerce_positive_int(existing_alias.get("alias_id"))
             compiled_outputs.append(
                 {
                     "alias_name": alias_name,
@@ -22649,7 +22651,8 @@ def _compile_q_linker_binding_fields(
                 {
                     "alias_name": alias_name,
                     "alias_path": alias_path,
-                    "alias_id": _coerce_positive_int((existing_alias_by_name.get(alias_name) or {}).get("alias_id")),
+                    "alias_id": _coerce_positive_int(output_item.get("alias_id"))
+                    or _coerce_positive_int((existing_alias_by_name.get(alias_name) or {}).get("alias_id")),
                     "target_field": {
                         "field_id": target_field.get("field_id"),
                         "que_id": target_ref,

package/src/qingflow_mcp/cli/commands/builder.py

@@ -4,6 +4,7 @@ import argparse
 from copy import deepcopy
 
 from ..context import CliContext
+from ...app_form_validator import AppFormValidationError, validate_declaration
 from ..json_io import load_json_value
 from .common import load_list_arg, load_object_arg, parse_bool_text, raise_config_error, require_list_arg
 
@@ -98,6 +99,29 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     package_apply.add_argument("--config-file", required=True)
     package_apply.set_defaults(handler=_handle_package_apply, format_hint="builder_summary", force_json_output=True)
 
+    app_form = builder_subparsers.add_parser("app-form", help="声明式应用表单")
+    app_form_subparsers = app_form.add_subparsers(dest="builder_app_form_command", required=True)
+
+    app_form_schema = app_form_subparsers.add_parser("schema", help="读取 AppForm Schema")
+    app_form_schema.add_argument("--schema-version")
+    app_form_schema.add_argument("--field-type")
+    app_form_schema.set_defaults(handler=_handle_app_form_schema, format_hint="builder_summary", force_json_output=True)
+
+    app_form_get = app_form_subparsers.add_parser("get", help="读取 canonical AppForm")
+    app_form_get.add_argument("--app-key", required=True)
+    app_form_get.add_argument("--schema-version")
+    app_form_get.add_argument("--being-draft", action=argparse.BooleanOptionalAction, default=False)
+    app_form_get.set_defaults(handler=_handle_app_form_get, format_hint="builder_summary", force_json_output=True)
+
+    app_form_apply = app_form_subparsers.add_parser("apply", help="应用完整 AppForm 声明")
+    app_form_apply.add_argument("--file", required=True, help="AppForm JSON 文件，- 表示 stdin")
+    app_form_apply.set_defaults(handler=_handle_app_form_apply, format_hint="builder_summary", force_json_output=True)
+
+    app_form_validate = app_form_subparsers.add_parser("validate", help="只校验 AppForm 声明，不访问后端")
+    app_form_validate.add_argument("--file", required=True, help="AppForm JSON 文件，- 表示 stdin")
+    app_form_validate.add_argument("--schema-version", help="固定使用的 AppForm Schema 版本")
+    app_form_validate.set_defaults(handler=_handle_app_form_validate, format_hint="builder_summary", force_json_output=True)
+
     app = builder_subparsers.add_parser("app", help="应用")
     app_subparsers = app.add_subparsers(dest="builder_app_command", required=True)
 
@@ -113,6 +137,10 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     app_release_lock.add_argument("--lock-owner-name", required=True)
     app_release_lock.set_defaults(handler=_handle_app_release_edit_lock_if_mine, format_hint="builder_summary", force_json_output=True)
 
+    app_delete = app_subparsers.add_parser("delete", help="删除应用")
+    app_delete.add_argument("--app-key", required=True)
+    app_delete.set_defaults(handler=_handle_app_delete, format_hint="builder_summary", force_json_output=True)
+
     app_get = app_subparsers.add_parser("get", help="读取应用配置（字段请使用: builder app get --app-key APP fields）")
     app_get.add_argument(
         "builder_app_get_section",
@@ -202,34 +230,6 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     portal_delete.add_argument("--dash-key", required=True)
     portal_delete.set_defaults(handler=_handle_portal_delete, format_hint="builder_summary", force_json_output=True)
 
-    schema_apply = builder_subparsers.add_parser("schema", help="字段搭建")
-    schema_apply_subparsers = schema_apply.add_subparsers(dest="builder_schema_command", required=True)
-    schema_apply_apply = schema_apply_subparsers.add_parser("apply", help="执行字段变更")
-    schema_apply_apply.add_argument("--app-key", default="")
-    schema_apply_apply.add_argument("--package-id", type=int)
-    schema_apply_apply.add_argument("--app-name", default="")
-    schema_apply_apply.add_argument("--app-title", default="")
-    schema_apply_apply.add_argument("--icon")
-    schema_apply_apply.add_argument("--color")
-    schema_apply_apply.add_argument("--visibility-file")
-    schema_apply_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=None)
-    schema_apply_apply.add_argument("--apps-file", help="多应用 schema JSON 对象；每项可带 client_key/app_name/form，支持 relation target_app_ref")
-    schema_apply_apply.add_argument("--form-file", help="单应用表单结构 JSON 数组；form[].rows[][] 同时声明字段和表单分组布局")
-    schema_apply_apply.add_argument("--add-fields-file", help="字段 JSON 数组；字段可用 as_data_title/as_data_cover 标记数据标题/封面")
-    schema_apply_apply.add_argument("--update-fields-file", help="字段更新 JSON 数组；set 内可用 as_data_title/as_data_cover 标记数据标题/封面")
-    schema_apply_apply.add_argument("--remove-fields-file")
-    schema_apply_apply.set_defaults(handler=_handle_schema_apply, format_hint="builder_summary", force_json_output=True)
-
-    layout_apply = builder_subparsers.add_parser("layout", help="布局")
-    layout_apply_subparsers = layout_apply.add_subparsers(dest="builder_layout_command", required=True)
-    layout_apply_apply = layout_apply_subparsers.add_parser("apply", help="执行布局变更")
-    layout_apply_apply.add_argument("--app-key", default="")
-    layout_apply_apply.add_argument("--apps-file", help="多应用布局 JSON 数组；每项包含 app_key/mode?/publish?/sections")
-    layout_apply_apply.add_argument("--mode", choices=["merge", "replace"], default="merge")
-    layout_apply_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
-    layout_apply_apply.add_argument("--sections-file")
-    layout_apply_apply.set_defaults(handler=_handle_layout_apply, format_hint="builder_summary", force_json_output=True)
-
     views_apply = builder_subparsers.add_parser("views", help="视图")
     views_apply_subparsers = views_apply.add_subparsers(dest="builder_views_command", required=True)
     views_apply_apply = views_apply_subparsers.add_parser("apply", help="执行视图变更")
@@ -331,6 +331,67 @@ def _handle_contract(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.builder_tool_contract(tool_name=args.tool_name)
 
 
+def _handle_app_form_schema(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_form_schema(
+        schema_version=args.schema_version,
+        field_type=args.field_type,
+    )
+
+
+def _handle_app_form_get(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_form_get(
+        profile=args.profile,
+        app_key=args.app_key,
+        schema_version=args.schema_version,
+        being_draft=bool(args.being_draft),
+    )
+
+
+def _handle_app_form_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    payload = load_json_value(
+        args.file,
+        option_name="--file",
+        max_bytes=2 * 1024 * 1024,
+        max_depth=64,
+    )
+    if not isinstance(payload, dict):
+        raise_config_error("builder app-form apply --file must contain a JSON object")
+    return context.builder.app_form_apply(profile=args.profile, spec=payload)
+
+
+def _handle_app_form_validate(args: argparse.Namespace, _context: CliContext) -> dict:
+    payload = load_json_value(
+        args.file,
+        option_name="--file",
+        max_bytes=2 * 1024 * 1024,
+        max_depth=64,
+    )
+    if not isinstance(payload, dict):
+        raise_config_error("builder app-form validate --file must contain a JSON object")
+    try:
+        result = validate_declaration(payload, schema_version=args.schema_version)
+    except AppFormValidationError as error:
+        return {
+            "category": "validation",
+            "status": "failed",
+            "ok": False,
+            "error_code": "INVALID_SPEC",
+            "message": "AppForm declaration failed validation",
+            "details": {
+                "schemaVersion": error.schema_version,
+                "apiVersion": error.api_version,
+                "issues": error.issues,
+            },
+        }
+    except (ValueError, RuntimeError) as error:
+        raise_config_error(str(error), error_code="VALIDATION_ERROR")
+    return {"category": "validation", "status": "success", "ok": True, **result, "message": "AppForm declaration is valid"}
+
+
+def _handle_app_delete(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_delete(profile=args.profile, app_key=args.app_key)
+
+
 def _handle_icon_catalog(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.workspace_icon_catalog_get(profile=args.profile)
 
@@ -554,6 +615,8 @@ def _handle_chart_get(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.chart_get(profile=args.profile, chart_id=args.chart_id)
 
 
+# TODO(deprecation): The legacy schema/layout CLI routes are removed. Keep the implementation below only
+# while internal migration and focused regression coverage still depend on the imperative adapters.
 def _handle_schema_apply(args: argparse.Namespace, context: CliContext) -> dict:
     apps_payload = _load_apps_file_arg(args.apps_file)
     apps = apps_payload["apps"]

package/src/qingflow_mcp/cli/json_io.py

@@ -8,7 +8,13 @@ from typing import Any
 from ..errors import QingflowApiError
 
 
-def load_json_value(path: str, *, option_name: str) -> Any:
+def load_json_value(
+    path: str,
+    *,
+    option_name: str,
+    max_bytes: int | None = None,
+    max_depth: int | None = None,
+) -> Any:
     if not path:
         raise QingflowApiError.config_error(f"{option_name} is required")
     if path == "-":
@@ -18,10 +24,23 @@ def load_json_value(path: str, *, option_name: str) -> Any:
             raw = Path(path).expanduser().read_text(encoding="utf-8")
         except OSError as exc:
             raise QingflowApiError.config_error(f"failed to read {option_name} from '{path}': {exc}") from exc
+    if max_bytes is not None and len(raw.encode("utf-8")) > max_bytes:
+        raise QingflowApiError.config_error(f"{option_name} exceeds the {max_bytes}-byte limit")
     try:
-        return json.loads(raw)
+        value = json.loads(raw)
     except json.JSONDecodeError as exc:
         raise QingflowApiError.config_error(f"{option_name} must contain valid JSON: {exc}") from exc
+    if max_depth is not None:
+        stack = [(value, 1)]
+        while stack:
+            item, depth = stack.pop()
+            if depth > max_depth:
+                raise QingflowApiError.config_error(f"{option_name} exceeds the maximum nesting depth {max_depth}")
+            if isinstance(item, dict):
+                stack.extend((child, depth + 1) for child in item.values())
+            elif isinstance(item, list):
+                stack.extend((child, depth + 1) for child in item)
+    return value
 
 
 def load_json_object(path: str, *, option_name: str) -> dict[str, Any]:

package/src/qingflow_mcp/cli/main.py

@@ -79,23 +79,6 @@ def run(
         return 2
     except SystemExit as exc:
         return int(exc.code or 0)
-    try:
-        _validate_conditional_args(args)
-    except _CliArgumentError as exc:
-        if _should_force_json_output_argv(normalized_argv):
-            payload = {
-                "category": "config",
-                "status": "failed",
-                "error_code": "ARGUMENT_ERROR",
-                "message": exc.message,
-                "details": {"usage": exc.usage.strip(), "prog": exc.prog},
-            }
-            payload = _maybe_attach_builder_apply_error_envelope_from_args(args, payload)
-            emit_json_result(payload, stream=out)
-            return 2
-        err.write(exc.usage)
-        err.write(f"{exc.prog}: error: {exc.message}\n")
-        return 2
     setattr(args, "_stdin", sys.stdin)
     setattr(args, "_stdout_stream", out)
     setattr(args, "_stderr_stream", err)
@@ -161,21 +144,6 @@ def _emit_version(*, json_mode: bool, stdout: TextIO) -> int:
     return 0
 
 
-def _validate_conditional_args(args: argparse.Namespace) -> None:
-    if (
-        getattr(args, "command", "") in {"builder", "build"}
-        and getattr(args, "builder_command", "") == "layout"
-        and getattr(args, "builder_layout_command", "") == "apply"
-        and not getattr(args, "apps_file", None)
-        and not getattr(args, "sections_file", None)
-    ):
-        raise _CliArgumentError(
-            prog="qingflow builder layout apply",
-            message="--sections-file is required",
-            usage="usage: qingflow builder layout apply --app-key APP_KEY --sections-file SECTIONS.json\n",
-        )
-
-
 def _should_force_json_output_argv_for_version(argv: list[str]) -> bool:
     return "--json" in argv
 
@@ -231,8 +199,10 @@ def _should_force_json_output_argv(argv: list[str]) -> bool:
         return False
     section = tokens[1]
     action = tokens[2]
-    if section in {"package", "button", "associated-resource", "associated-resources", "portal", "schema", "layout", "views", "flow", "charts"}:
+    if section in {"package", "button", "associated-resource", "associated-resources", "portal", "views", "flow", "charts"}:
         return action == "apply"
+    if section == "app-form":
+        return action in {"schema", "get", "validate", "apply"}
     if section == "publish":
         return action == "verify"
     if section == "app":
@@ -283,10 +253,6 @@ def _builder_apply_operation_from_args(args: argparse.Namespace) -> str | None:
         return "portal_apply"
     if section == "portal" and getattr(args, "builder_portal_command", "") == "delete":
         return "portal_delete"
-    if section == "schema" and getattr(args, "builder_schema_command", "") == "apply":
-        return "app_schema_apply"
-    if section == "layout" and getattr(args, "builder_layout_command", "") == "apply":
-        return "app_layout_apply"
     if section == "views" and getattr(args, "builder_views_command", "") == "apply":
         return "app_views_apply"
     if section == "flow" and getattr(args, "builder_flow_command", "") == "apply":
@@ -312,8 +278,6 @@ def _builder_apply_operation_from_argv(argv: list[str]) -> str | None:
         "associated-resource": "app_associated_resources_apply",
         "associated-resources": "app_associated_resources_apply",
         "portal": "portal_apply",
-        "schema": "app_schema_apply",
-        "layout": "app_layout_apply",
         "views": "app_views_apply",
         "flow": "app_flow_apply",
         "charts": "app_charts_apply",

package/src/qingflow_mcp/cloud_auth.py

@@ -25,6 +25,7 @@ from .json_types import JSONObject
 AUTH_CONTEXT_KEY_PREFIX = "mcp:auth:context"
 AUTH_CONTEXT_LOCK_KEY_PREFIX = "mcp:auth:context:lock"
 AUTH_CONTEXT_NEGATIVE_KEY_PREFIX = "mcp:auth:context:negative"
+ACCESS_PLATFORM_KEY_PREFIX = "oauth2:access-platform:"
 
 
 @dataclass(slots=True)
@@ -103,6 +104,16 @@ class CloudAuthBroker:
     def invalidate(self, credential_hash: str) -> None:
         self.cache.delete(self._auth_key(credential_hash))
 
+    def resolve_call_platform(self, access_token: str) -> str:
+        normalized_token = self._normalize_text(access_token)
+        if normalized_token is None:
+            return ""
+        try:
+            value = self.cache.get_text(f"{ACCESS_PLATFORM_KEY_PREFIX}{normalized_token}")
+        except QingflowApiError:
+            return ""
+        return self._normalize_text(value) or ""
+
     @staticmethod
     def credential_hash(credential: str) -> str:
         return sha256(credential.encode("utf-8")).hexdigest()

package/src/qingflow_mcp/cloud_context.py

@@ -68,3 +68,8 @@ current_cloud_context: ContextVar[CloudMcpContext | None] = ContextVar(
     "qingflow_mcp_current_cloud_context",
     default=None,
 )
+
+current_call_platform: ContextVar[str] = ContextVar(
+    "qingflow_mcp_current_call_platform",
+    default="",
+)