@josephyan/qingflow-cli 1.0.11 → 1.1.2

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

@@ -1,11 +1,20 @@
 from __future__ import annotations
 
 import argparse
+from typing import Any
 
 from ..context import CliContext
 from .common import load_list_arg, load_object_arg, raise_config_error, require_list_arg
 
 
+def _parse_app_keys_arg(raw: Any) -> list[str] | None:
+    """Parse comma-separated --app-keys argument into a list, or return None if empty."""
+    if not raw:
+        return None
+    keys = [k.strip() for k in str(raw).split(",") if k.strip()]
+    return keys if keys else None
+
+
 def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
     parser = subparsers.add_parser("builder", aliases=["build"], help="稳定 builder 命令")
     builder_subparsers = parser.add_subparsers(dest="builder_command", required=True)
@@ -42,6 +51,11 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     contract.add_argument("--tool-name", required=True)
     contract.set_defaults(handler=_handle_contract, format_hint="builder_summary")
 
+    icon = builder_subparsers.add_parser("icon", help="工作区图标目录")
+    icon_subparsers = icon.add_subparsers(dest="builder_icon_command", required=True)
+    icon_catalog = icon_subparsers.add_parser("catalog", help="读取应用、应用包、门户可用图标目录")
+    icon_catalog.set_defaults(handler=_handle_icon_catalog, format_hint="builder_summary")
+
     member = builder_subparsers.add_parser("member", help="成员目录")
     member_subparsers = member.add_subparsers(dest="builder_member_command", required=True)
     member_search = member_subparsers.add_parser("search", help="搜索成员")
@@ -78,13 +92,18 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     solution_install.add_argument("--solution-source", default="solutionDetail")
     solution_install.set_defaults(handler=_handle_solution_install, format_hint="builder_summary")
 
+    package_list = package_subparsers.add_parser("list", help="列出应用包")
+    package_list.add_argument("--trial-status", default="all")
+    package_list.add_argument("--query", default="")
+    package_list.set_defaults(handler=_handle_package_list, format_hint="builder_summary")
+
     package_get = package_subparsers.add_parser("get", help="读取应用包详情")
     package_get.add_argument("--package-id", type=int, required=True)
     package_get.set_defaults(handler=_handle_package_get, format_hint="builder_summary")
 
     package_apply = package_subparsers.add_parser("apply", help="创建或更新应用包配置")
     package_apply.add_argument("--config-file", required=True)
-    package_apply.set_defaults(handler=_handle_package_apply, format_hint="builder_summary")
+    package_apply.set_defaults(handler=_handle_package_apply, 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)
@@ -99,16 +118,17 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     app_release_lock.add_argument("--app-key", required=True)
     app_release_lock.add_argument("--lock-owner-email", required=True)
     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")
+    app_release_lock.set_defaults(handler=_handle_app_release_edit_lock_if_mine, 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",
         nargs="?",
-        choices=["summary", "fields", "layout", "views", "flow", "charts"],
+        choices=["summary", "fields", "layout", "views", "flow", "charts", "buttons", "associated-resources"],
         default="summary",
     )
-    app_get.add_argument("--app-key", required=True)
+    app_get.add_argument("--app-key", default="")
+    app_get.add_argument("--app-keys", help="逗号分隔的多应用批量读取，例如: KEY1,KEY2,KEY3")
     app_get.set_defaults(handler=_handle_app_get, format_hint="builder_summary")
 
     app_repair_code_blocks = app_subparsers.add_parser("repair-code-blocks", help="扫描或修复现有代码块配置")
@@ -123,30 +143,36 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     button_catalog = button_subparsers.add_parser("catalog", help="读取按钮样式目录")
     button_catalog.set_defaults(handler=_handle_button_catalog, format_hint="builder_summary")
 
-    button_list = button_subparsers.add_parser("list", help="列出自定义按钮")
-    button_list.add_argument("--app-key", required=True)
-    button_list.set_defaults(handler=_handle_button_list, format_hint="builder_summary")
-
-    button_get = button_subparsers.add_parser("get", help="读取自定义按钮")
-    button_get.add_argument("--app-key", required=True)
-    button_get.add_argument("--button-id", type=int, required=True)
+    button_get = button_subparsers.add_parser("get", help="读取应用自定义按钮配置")
+    button_get.add_argument("--app-key", default="")
+    button_get.add_argument("--app-keys", help="逗号分隔的多应用批量读取，例如: KEY1,KEY2,KEY3")
     button_get.set_defaults(handler=_handle_button_get, format_hint="builder_summary")
 
-    button_create = button_subparsers.add_parser("create", help="创建自定义按钮")
-    button_create.add_argument("--app-key", required=True)
-    button_create.add_argument("--payload-file", required=True)
-    button_create.set_defaults(handler=_handle_button_create, format_hint="builder_summary")
-
-    button_update = button_subparsers.add_parser("update", help="更新自定义按钮")
-    button_update.add_argument("--app-key", required=True)
-    button_update.add_argument("--button-id", type=int, required=True)
-    button_update.add_argument("--payload-file", required=True)
-    button_update.set_defaults(handler=_handle_button_update, format_hint="builder_summary")
-
-    button_delete = button_subparsers.add_parser("delete", help="删除自定义按钮")
-    button_delete.add_argument("--app-key", required=True)
-    button_delete.add_argument("--button-id", type=int, required=True)
-    button_delete.set_defaults(handler=_handle_button_delete, format_hint="builder_summary")
+    button_apply = button_subparsers.add_parser("apply", help="声明式创建、更新或删除自定义按钮")
+    button_apply.add_argument("--app-key", default="")
+    button_apply.add_argument("--upsert-buttons-file")
+    button_apply.add_argument("--patch-buttons-file")
+    button_apply.add_argument("--remove-buttons-file")
+    button_apply.add_argument("--view-configs-file")
+    button_apply.add_argument("--apps-file", help="多应用批量按钮 JSON 数组，每项含 app_key + upsert_buttons/patch_buttons/remove_buttons/view_configs")
+    button_apply.set_defaults(handler=_handle_button_apply, format_hint="builder_summary", force_json_output=True)
+
+    associated_resource = builder_subparsers.add_parser("associated-resource", aliases=["associated-resources"], help="关联视图/报表")
+    associated_resource_subparsers = associated_resource.add_subparsers(dest="builder_associated_resource_command", required=True)
+
+    associated_resource_get = associated_resource_subparsers.add_parser("get", help="读取应用关联资源配置")
+    associated_resource_get.add_argument("--app-key", default="")
+    associated_resource_get.add_argument("--app-keys", help="逗号分隔的多应用批量读取，例如: KEY1,KEY2,KEY3")
+    associated_resource_get.set_defaults(handler=_handle_associated_resource_get, format_hint="builder_summary")
+
+    associated_resource_apply = associated_resource_subparsers.add_parser("apply", help="声明式管理应用关联资源池和视图展示配置")
+    associated_resource_apply.add_argument("--app-key", required=True)
+    associated_resource_apply.add_argument("--upsert-resources-file")
+    associated_resource_apply.add_argument("--patch-resources-file")
+    associated_resource_apply.add_argument("--remove-associated-item-ids-file")
+    associated_resource_apply.add_argument("--reorder-associated-item-ids-file")
+    associated_resource_apply.add_argument("--view-configs-file")
+    associated_resource_apply.set_defaults(handler=_handle_associated_resource_apply, format_hint="builder_summary", force_json_output=True)
 
     portal = builder_subparsers.add_parser("portal", help="门户")
     portal_subparsers = portal.add_subparsers(dest="builder_portal_command", required=True)
@@ -163,7 +189,9 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     portal_apply.add_argument("--dash-name", default="")
     portal_apply.add_argument("--package-id", type=int)
     portal_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
+    portal_apply.add_argument("--payload-file")
     portal_apply.add_argument("--sections-file")
+    portal_apply.add_argument("--layout-preset", default="")
     portal_apply.add_argument("--visibility-file")
     portal_apply.add_argument("--auth-file")
     portal_apply.add_argument("--icon")
@@ -171,7 +199,8 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     portal_apply.add_argument("--hide-copyright", action=argparse.BooleanOptionalAction, default=None)
     portal_apply.add_argument("--dash-global-config-file")
     portal_apply.add_argument("--config-file")
-    portal_apply.set_defaults(handler=_handle_portal_apply, format_hint="builder_summary")
+    portal_apply.add_argument("--patch-sections-file", help="门户组件局部更新 JSON 数组，每项含 chart_ref/view_ref/order + set/unset")
+    portal_apply.set_defaults(handler=_handle_portal_apply, 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)
@@ -185,54 +214,72 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     schema_apply_apply.add_argument("--visibility-file")
     schema_apply_apply.add_argument("--create-if-missing", action="store_true")
     schema_apply_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
-    schema_apply_apply.add_argument("--add-fields-file")
-    schema_apply_apply.add_argument("--update-fields-file")
+    schema_apply_apply.add_argument("--apps-file", help="多应用 schema JSON 数组；每项可带 client_key/app_name/add_fields，支持 relation target_app_ref")
+    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")
+    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", required=True)
+    layout_apply_apply.add_argument("--app-key", default="")
     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", required=True)
-    layout_apply_apply.set_defaults(handler=_handle_layout_apply, format_hint="builder_summary")
+    layout_apply_apply.add_argument("--sections-file")
+    layout_apply_apply.add_argument("--apps-file", help="多应用批量布局 JSON 数组，每项含 app_key + sections")
+    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="执行视图变更")
-    views_apply_apply.add_argument("--app-key", required=True)
+    views_apply_apply.add_argument("--app-key", default="")
     views_apply_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
     views_apply_apply.add_argument("--upsert-views-file")
+    views_apply_apply.add_argument("--patch-views-file")
     views_apply_apply.add_argument("--remove-views-file")
-    views_apply_apply.set_defaults(handler=_handle_views_apply, format_hint="builder_summary")
-
-    flow_apply = builder_subparsers.add_parser("flow", help="流程")
-    flow_apply_subparsers = flow_apply.add_subparsers(dest="builder_flow_command", required=True)
-    flow_apply_apply = flow_apply_subparsers.add_parser("apply", help="执行流程变更")
-    flow_apply_apply.add_argument("--app-key", required=True)
-    flow_apply_apply.add_argument("--mode", choices=["replace"], default="replace")
-    flow_apply_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
-    flow_apply_apply.add_argument("--nodes-file", required=True)
-    flow_apply_apply.add_argument("--transitions-file", required=True)
-    flow_apply_apply.set_defaults(handler=_handle_flow_apply, format_hint="builder_summary")
+    views_apply_apply.add_argument("--apps-file", help="多应用批量视图 JSON 数组，每项含 app_key + upsert_views/patch_views/remove_views")
+    views_apply_apply.set_defaults(handler=_handle_views_apply, format_hint="builder_summary", force_json_output=True)
+
+    flow_parser = builder_subparsers.add_parser("flow", help="流程（WorkflowSpec）")
+    flow_subparsers = flow_parser.add_subparsers(dest="builder_flow_command", required=True)
+
+    flow_schema = flow_subparsers.add_parser("schema", help="读取 WorkflowSpec JSON Schema")
+    flow_schema.add_argument("--schema-version", default="")
+    flow_schema.set_defaults(handler=_handle_flow_schema, format_hint="builder_summary")
+
+    flow_get = flow_subparsers.add_parser("get", help="读取 WorkflowSpec")
+    flow_get.add_argument("--app-key", required=True)
+    flow_get.add_argument("--version-id", default="")
+    flow_get.set_defaults(handler=_handle_flow_get, format_hint="builder_summary")
+
+    flow_apply = flow_subparsers.add_parser("apply", help="应用 WorkflowSpec")
+    flow_apply.add_argument("--app-key", required=True)
+    flow_apply.add_argument("--spec-file")
+    flow_apply.add_argument("--patch-nodes-file", help="节点局部更新 JSON 数组，每项含 id + set/unset")
+    flow_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
+    flow_apply.add_argument("--idempotency-key", default="")
+    flow_apply.add_argument("--schema-version", default="")
+    flow_apply.set_defaults(handler=_handle_flow_apply, format_hint="builder_summary", force_json_output=True)
 
     charts_apply = builder_subparsers.add_parser("charts", help="报表")
     charts_apply_subparsers = charts_apply.add_subparsers(dest="builder_charts_command", required=True)
     charts_apply_apply = charts_apply_subparsers.add_parser("apply", help="执行报表变更")
-    charts_apply_apply.add_argument("--app-key", required=True)
+    charts_apply_apply.add_argument("--app-key", default="")
     charts_apply_apply.add_argument("--upsert-file")
+    charts_apply_apply.add_argument("--patch-file")
     charts_apply_apply.add_argument("--remove-chart-ids-file")
     charts_apply_apply.add_argument("--reorder-chart-ids-file")
-    charts_apply_apply.set_defaults(handler=_handle_charts_apply, format_hint="builder_summary")
+    charts_apply_apply.add_argument("--apps-file", help="多应用批量报表 JSON 数组，每项含 app_key + upsert_charts/patch_charts/remove_chart_ids/reorder_chart_ids")
+    charts_apply_apply.set_defaults(handler=_handle_charts_apply, format_hint="builder_summary", force_json_output=True)
 
     publish_verify = builder_subparsers.add_parser("publish", help="发布校验")
     publish_verify_subparsers = publish_verify.add_subparsers(dest="builder_publish_command", required=True)
     publish_verify_verify = publish_verify_subparsers.add_parser("verify", help="校验应用发布")
-    publish_verify_verify.add_argument("--app-key", required=True)
+    publish_verify_verify.add_argument("--app-key", default="")
+    publish_verify_verify.add_argument("--app-keys", help="逗号分隔的多应用批量校验，例如: KEY1,KEY2,KEY3")
     publish_verify_verify.add_argument("--expected-package-id", type=int)
-    publish_verify_verify.set_defaults(handler=_handle_publish_verify, format_hint="builder_summary")
+    publish_verify_verify.set_defaults(handler=_handle_publish_verify, format_hint="builder_summary", force_json_output=True)
 
     view = builder_subparsers.add_parser("view", help="视图详情")
     view_subparsers = view.add_subparsers(dest="builder_view_command", required=True)
@@ -280,6 +327,10 @@ def _handle_contract(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.builder_tool_contract(tool_name=args.tool_name)
 
 
+def _handle_icon_catalog(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.workspace_icon_catalog_get(profile=args.profile)
+
+
 def _handle_member_search(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.member_search(
         profile=args.profile,
@@ -323,6 +374,10 @@ def _handle_package_get(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.package_get(profile=args.profile, package_id=args.package_id)
 
 
+def _handle_package_list(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.package_list(profile=args.profile, trial_status=args.trial_status, query=args.query)
+
+
 def _handle_package_apply(args: argparse.Namespace, context: CliContext) -> dict:
     config = load_object_arg(args.config_file, option_name="--config-file")
     if not isinstance(config, dict):
@@ -369,8 +424,67 @@ def _handle_button_catalog(args: argparse.Namespace, context: CliContext) -> dic
     return context.builder.button_style_catalog_get(profile=args.profile)
 
 
+def _handle_button_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    apps = load_list_arg(getattr(args, "apps_file", None), option_name="--apps-file")
+    if apps:
+        single_app_args = [a for a in ["--app-key" if args.app_key else None, "--upsert-buttons-file" if getattr(args, "upsert_buttons_file", None) else None, "--patch-buttons-file" if getattr(args, "patch_buttons_file", None) else None, "--remove-buttons-file" if getattr(args, "remove_buttons_file", None) else None, "--view-configs-file" if getattr(args, "view_configs_file", None) else None] if a]
+        if single_app_args:
+            raise_config_error(
+                f"button apply --apps-file cannot be combined with {', '.join(single_app_args)}.",
+                fix_hint="Use --apps-file for batch mode (each item contains app_key + per-app params), or remove --apps-file for single-app mode.",
+            )
+    if apps:
+        return context.builder.app_custom_buttons_apply(
+            profile=args.profile,
+            app_key="",
+            upsert_buttons=[],
+            patch_buttons=[],
+            remove_buttons=[],
+            view_configs=[],
+            apps=apps,
+        )
+    if not args.app_key:
+        raise_config_error("button apply requires --app-key or --apps-file", fix_hint="Pass --app-key APP_KEY for single-app mode, or --apps-file for batch mode.")
+    return context.builder.app_custom_buttons_apply(
+        profile=args.profile,
+        app_key=args.app_key,
+        upsert_buttons=load_list_arg(args.upsert_buttons_file, option_name="--upsert-buttons-file"),
+        patch_buttons=load_list_arg(args.patch_buttons_file, option_name="--patch-buttons-file"),
+        remove_buttons=load_list_arg(args.remove_buttons_file, option_name="--remove-buttons-file"),
+        view_configs=load_list_arg(args.view_configs_file, option_name="--view-configs-file"),
+    )
+
+
+def _handle_associated_resource_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_associated_resources_apply(
+        profile=args.profile,
+        app_key=args.app_key,
+        upsert_resources=load_list_arg(args.upsert_resources_file, option_name="--upsert-resources-file"),
+        patch_resources=load_list_arg(args.patch_resources_file, option_name="--patch-resources-file"),
+        remove_associated_item_ids=load_list_arg(args.remove_associated_item_ids_file, option_name="--remove-associated-item-ids-file"),
+        reorder_associated_item_ids=load_list_arg(args.reorder_associated_item_ids_file, option_name="--reorder-associated-item-ids-file"),
+        view_configs=load_list_arg(args.view_configs_file, option_name="--view-configs-file"),
+    )
+
+
 def _handle_button_get(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.app_custom_button_get(profile=args.profile, app_key=args.app_key, button_id=args.button_id)
+    app_keys = _parse_app_keys_arg(getattr(args, "app_keys", None))
+    if app_keys:
+        return context.builder.app_get_buttons(profile=args.profile, app_keys=app_keys)
+    app_key = str(getattr(args, "app_key", "") or "").strip()
+    if not app_key:
+        raise_config_error("button get requires --app-key or --app-keys", fix_hint="Pass --app-key APP_KEY or --app-keys KEY1,KEY2")
+    return context.builder.app_get_buttons(profile=args.profile, app_key=app_key)
+
+
+def _handle_associated_resource_get(args: argparse.Namespace, context: CliContext) -> dict:
+    app_keys = _parse_app_keys_arg(getattr(args, "app_keys", None))
+    if app_keys:
+        return context.builder.app_get_associated_resources(profile=args.profile, app_keys=app_keys)
+    app_key = str(getattr(args, "app_key", "") or "").strip()
+    if not app_key:
+        raise_config_error("associated-resource get requires --app-key or --app-keys", fix_hint="Pass --app-key APP_KEY or --app-keys KEY1,KEY2")
+    return context.builder.app_get_associated_resources(profile=args.profile, app_key=app_key)
 
 
 def _handle_button_create(args: argparse.Namespace, context: CliContext) -> dict:
@@ -395,6 +509,30 @@ def _handle_button_delete(args: argparse.Namespace, context: CliContext) -> dict
 
 
 def _handle_app_get(args: argparse.Namespace, context: CliContext) -> dict:
+    section = args.builder_app_get_section
+    app_keys = _parse_app_keys_arg(getattr(args, "app_keys", None))
+    app_key = str(getattr(args, "app_key", "") or "").strip()
+    if not app_keys and not app_key:
+        raise_config_error("app get requires --app-key or --app-keys", fix_hint="Pass --app-key APP_KEY or --app-keys KEY1,KEY2")
+    if section == "buttons":
+        if app_keys:
+            return context.builder.app_get_buttons(profile=args.profile, app_keys=app_keys)
+        return context.builder.app_get_buttons(profile=args.profile, app_key=app_key)
+    if section == "associated-resources":
+        if app_keys:
+            return context.builder.app_get_associated_resources(profile=args.profile, app_keys=app_keys)
+        return context.builder.app_get_associated_resources(profile=args.profile, app_key=app_key)
+    if app_keys:
+        batch_handlers = {
+            "fields": context.builder.app_get_fields,
+            "layout": context.builder.app_get_layout,
+            "views": context.builder.app_get_views,
+            "flow": context.builder.app_get_flow,
+            "charts": context.builder.app_get_charts,
+        }
+        if section not in batch_handlers:
+            raise_config_error(f"app get --app-keys does not support section '{section}'", fix_hint="Batch reads support: fields, layout, views, flow, charts, buttons, associated-resources")
+        return batch_handlers[section](profile=args.profile, app_keys=app_keys)
     handlers = {
         "summary": context.builder.app_get,
         "fields": context.builder.app_get_fields,
@@ -403,7 +541,7 @@ def _handle_app_get(args: argparse.Namespace, context: CliContext) -> dict:
         "flow": context.builder.app_get_flow,
         "charts": context.builder.app_get_charts,
     }
-    return handlers[args.builder_app_get_section](profile=args.profile, app_key=args.app_key)
+    return handlers[section](profile=args.profile, app_key=app_key)
 
 
 def _handle_app_repair_code_blocks(args: argparse.Namespace, context: CliContext) -> dict:
@@ -432,6 +570,34 @@ def _handle_chart_get(args: argparse.Namespace, context: CliContext) -> dict:
 
 
 def _handle_schema_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    apps = load_list_arg(args.apps_file, option_name="--apps-file")
+    if args.apps_file:
+        if not apps:
+            raise_config_error(
+                "schema apply multi-app mode requires a non-empty --apps-file.",
+                fix_hint="Pass a JSON array with at least one app item.",
+            )
+        if args.app_key or args.app_name or args.app_title or args.add_fields_file or args.update_fields_file or args.remove_fields_file:
+            raise_config_error(
+                "schema apply multi-app mode accepts --package-id/--create-if-missing plus --apps-file only.",
+                fix_hint="Use `--apps-file` for batch mode, or remove `--apps-file` and use the single-app arguments.",
+            )
+        if args.package_id is None:
+            raise_config_error(
+                "schema apply multi-app mode requires --package-id.",
+                fix_hint="Pass `--package-id` and app names inside --apps-file.",
+            )
+        return context.builder.app_schema_apply(
+            profile=args.profile,
+            package_id=args.package_id,
+            visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
+            create_if_missing=bool(args.create_if_missing),
+            publish=bool(args.publish),
+            apps=apps,
+            add_fields=[],
+            update_fields=[],
+            remove_fields=[],
+        )
     has_app_key = bool((args.app_key or "").strip())
     has_app_name = bool((args.app_name or "").strip())
     has_app_title = bool((args.app_title or "").strip())
@@ -466,6 +632,25 @@ def _handle_schema_apply(args: argparse.Namespace, context: CliContext) -> dict:
 
 
 def _handle_layout_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    apps = load_list_arg(getattr(args, "apps_file", None), option_name="--apps-file")
+    if apps:
+        single_app_args = [a for a in ["--app-key" if args.app_key else None, "--sections-file" if getattr(args, "sections_file", None) else None] if a]
+        if single_app_args:
+            raise_config_error(
+                f"layout apply --apps-file cannot be combined with {', '.join(single_app_args)}.",
+                fix_hint="Use --apps-file for batch mode (each item contains app_key + sections), or remove --apps-file for single-app mode.",
+            )
+    if apps:
+        return context.builder.app_layout_apply(
+            profile=args.profile,
+            app_key="",
+            mode=args.mode,
+            publish=bool(args.publish),
+            sections=[],
+            apps=apps,
+        )
+    if not args.app_key:
+        raise_config_error("layout apply requires --app-key or --apps-file", fix_hint="Pass --app-key + --sections-file for single-app mode, or --apps-file for batch mode.")
     return context.builder.app_layout_apply(
         profile=args.profile,
         app_key=args.app_key,
@@ -476,40 +661,144 @@ def _handle_layout_apply(args: argparse.Namespace, context: CliContext) -> dict:
 
 
 def _handle_views_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    apps = load_list_arg(getattr(args, "apps_file", None), option_name="--apps-file")
+    if apps:
+        single_app_args = [a for a in ["--app-key" if args.app_key else None, "--upsert-views-file" if getattr(args, "upsert_views_file", None) else None, "--patch-views-file" if getattr(args, "patch_views_file", None) else None, "--remove-views-file" if getattr(args, "remove_views_file", None) else None] if a]
+        if single_app_args:
+            raise_config_error(
+                f"views apply --apps-file cannot be combined with {', '.join(single_app_args)}.",
+                fix_hint="Use --apps-file for batch mode (each item contains app_key + per-app params), or remove --apps-file for single-app mode.",
+            )
+    if apps:
+        return context.builder.app_views_apply(
+            profile=args.profile,
+            app_key="",
+            publish=bool(args.publish),
+            upsert_views=[],
+            patch_views=[],
+            remove_views=[],
+            apps=apps,
+        )
+    if not args.app_key:
+        raise_config_error("views apply requires --app-key or --apps-file", fix_hint="Pass --app-key for single-app mode, or --apps-file for batch mode.")
     return context.builder.app_views_apply(
         profile=args.profile,
         app_key=args.app_key,
         publish=bool(args.publish),
         upsert_views=load_list_arg(args.upsert_views_file, option_name="--upsert-views-file"),
+        patch_views=load_list_arg(args.patch_views_file, option_name="--patch-views-file"),
         remove_views=load_list_arg(args.remove_views_file, option_name="--remove-views-file"),
     )
 
 
+def _handle_flow_schema(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_flow_get_schema(
+        profile=args.profile,
+        schema_version=args.schema_version or None,
+    )
+
+
+def _handle_flow_get(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.builder.app_get_flow(
+        profile=args.profile,
+        app_key=args.app_key,
+        version_id=args.version_id or None,
+    )
+
+
 def _handle_flow_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    patch_nodes = load_list_arg(getattr(args, "patch_nodes_file", None), option_name="--patch-nodes-file")
+    if patch_nodes and args.spec_file:
+        raise_config_error(
+            "flow apply --spec-file and --patch-nodes-file are mutually exclusive.",
+            fix_hint="Use --spec-file to replace the full flow spec, or --patch-nodes-file to patch specific nodes.",
+        )
+    if patch_nodes:
+        return context.builder.app_flow_apply(
+            profile=args.profile,
+            app_key=args.app_key,
+            publish=bool(args.publish),
+            spec=None,
+            patch_nodes=patch_nodes,
+            idempotency_key=args.idempotency_key or None,
+            schema_version=args.schema_version or None,
+        )
+    spec_payload = load_object_arg(args.spec_file, option_name="--spec-file") if args.spec_file else None
+    if not isinstance(spec_payload, dict):
+        raise_config_error("flow apply requires either --spec-file or --patch-nodes-file.", fix_hint="Pass --spec-file to replace the full flow spec, or --patch-nodes-file to patch specific nodes.")
+    if "spec" in spec_payload and isinstance(spec_payload.get("spec"), dict):
+        spec = spec_payload["spec"]
+    else:
+        spec = spec_payload
     return context.builder.app_flow_apply(
         profile=args.profile,
         app_key=args.app_key,
-        mode=args.mode,
         publish=bool(args.publish),
-        nodes=require_list_arg(args.nodes_file, option_name="--nodes-file"),
-        transitions=require_list_arg(args.transitions_file, option_name="--transitions-file"),
+        spec=spec,
+        idempotency_key=args.idempotency_key or None,
+        schema_version=args.schema_version or None,
     )
 
 
 def _handle_charts_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    apps = load_list_arg(getattr(args, "apps_file", None), option_name="--apps-file")
+    if apps:
+        single_app_args = [a for a in ["--app-key" if args.app_key else None, "--upsert-file" if getattr(args, "upsert_file", None) else None, "--patch-file" if getattr(args, "patch_file", None) else None, "--remove-chart-ids-file" if getattr(args, "remove_chart_ids_file", None) else None, "--reorder-chart-ids-file" if getattr(args, "reorder_chart_ids_file", None) else None] if a]
+        if single_app_args:
+            raise_config_error(
+                f"charts apply --apps-file cannot be combined with {', '.join(single_app_args)}.",
+                fix_hint="Use --apps-file for batch mode (each item contains app_key + per-app params), or remove --apps-file for single-app mode.",
+            )
+    if apps:
+        return context.builder.app_charts_apply(
+            profile=args.profile,
+            app_key="",
+            upsert_charts=[],
+            patch_charts=[],
+            remove_chart_ids=[],
+            reorder_chart_ids=[],
+            apps=apps,
+        )
+    if not args.app_key:
+        raise_config_error("charts apply requires --app-key or --apps-file", fix_hint="Pass --app-key for single-app mode, or --apps-file for batch mode.")
     return context.builder.app_charts_apply(
         profile=args.profile,
         app_key=args.app_key,
         upsert_charts=load_list_arg(args.upsert_file, option_name="--upsert-file"),
+        patch_charts=load_list_arg(args.patch_file, option_name="--patch-file"),
         remove_chart_ids=load_list_arg(args.remove_chart_ids_file, option_name="--remove-chart-ids-file"),
         reorder_chart_ids=load_list_arg(args.reorder_chart_ids_file, option_name="--reorder-chart-ids-file"),
     )
 
 
 def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    patch_sections = load_list_arg(getattr(args, "patch_sections_file", None), option_name="--patch-sections-file")
+    if patch_sections:
+        if not (args.dash_key or "").strip():
+            raise_config_error("portal apply --patch-sections-file requires --dash-key", fix_hint="Pass --dash-key DASH_KEY to identify the portal to patch")
+        has_sections_file = bool(getattr(args, "sections_file", None))
+        has_payload_file = bool(getattr(args, "payload_file", None))
+        if has_sections_file or has_payload_file:
+            raise_config_error(
+                "portal apply --patch-sections-file cannot be combined with --sections-file or --payload-file.",
+                fix_hint="Use --patch-sections-file alone to patch specific sections, or --sections-file to replace all sections.",
+            )
+        return context.builder.portal_apply(
+            profile=args.profile,
+            dash_key=args.dash_key,
+            dash_name="",
+            package_id=None,
+            publish=bool(args.publish),
+            sections=[],
+            patch_sections=patch_sections,
+        )
+    payload = load_object_arg(args.payload_file, option_name="--payload-file") if getattr(args, "payload_file", None) else None
+    payload_obj = payload if isinstance(payload, dict) else {}
+    effective_dash_name = (args.dash_name or str(payload_obj.get("dash_name") or payload_obj.get("dashName") or payload_obj.get("name") or "")).strip()
+    effective_package_id = args.package_id if args.package_id is not None else payload_obj.get("package_id") or payload_obj.get("packageId") or payload_obj.get("package_tag_id")
     has_dash_key = bool((args.dash_key or "").strip())
-    has_dash_name = bool((args.dash_name or "").strip())
-    has_package_id = args.package_id is not None
+    has_dash_name = bool(effective_dash_name)
+    has_package_id = effective_package_id is not None
     if has_dash_key and has_package_id:
         raise_config_error(
             "portal apply accepts exactly one selector mode.",
@@ -528,6 +817,7 @@ def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
         package_id=args.package_id,
         publish=bool(args.publish),
         sections=sections,
+        layout_preset=args.layout_preset,
         visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
         auth=load_object_arg(args.auth_file, option_name="--auth-file"),
         icon=args.icon,
@@ -535,10 +825,18 @@ def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
         hide_copyright=args.hide_copyright,
         dash_global_config=load_object_arg(args.dash_global_config_file, option_name="--dash-global-config-file"),
         config=load_object_arg(args.config_file, option_name="--config-file"),
+        payload=payload,
     )
 
 
 def _handle_publish_verify(args: argparse.Namespace, context: CliContext) -> dict:
+    app_keys = _parse_app_keys_arg(getattr(args, "app_keys", None))
+    if app_keys:
+        return context.builder.app_publish_verify(
+            profile=args.profile,
+            app_keys=app_keys,
+            expected_package_id=args.expected_package_id,
+        )
     return context.builder.app_publish_verify(
         profile=args.profile,
         app_key=args.app_key,