@qingflow-tech/qingflow-app-user-mcp 1.0.9 → 1.0.11

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

@@ -13,30 +13,17 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     app_subparsers = parser.add_subparsers(dest="app_command", required=True)
 
     list_parser = app_subparsers.add_parser("list", help="列出可见应用")
+    list_parser.add_argument("--query", default="", help="按关键词在可见应用列表中本地过滤")
+    list_parser.add_argument("--keyword", default="", help="兼容别名；建议使用 --query")
     list_parser.set_defaults(handler=_handle_list, format_hint="app_list")
 
-    search = app_subparsers.add_parser("search", help="搜索应用")
-    search.add_argument("--keyword", default="")
-    search.add_argument("--page", type=int, default=1)
-    search.add_argument("--page-size", type=int, default=50)
-    search.set_defaults(handler=_handle_search, format_hint="app_search")
-
     get = app_subparsers.add_parser("get", help="读取应用可访问视图与导入能力")
     get.add_argument("--app-key", help="不传时在交互终端中选择应用")
     get.set_defaults(handler=_handle_get, format_hint="app_get")
 
 
 def _handle_list(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.app.app_list(profile=args.profile)
-
-
-def _handle_search(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.app.app_search(
-        profile=args.profile,
-        keyword=args.keyword,
-        page_num=args.page,
-        page_size=args.page_size,
-    )
+    return context.app.app_list(profile=args.profile, query=args.query, keyword=args.keyword)
 
 
 def _handle_get(args: argparse.Namespace, context: CliContext) -> dict:

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

@@ -42,6 +42,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 +83,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,7 +109,7 @@ 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(
@@ -129,7 +139,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     button_apply.add_argument("--patch-buttons-file")
     button_apply.add_argument("--remove-buttons-file")
     button_apply.add_argument("--view-configs-file")
-    button_apply.set_defaults(handler=_handle_button_apply, format_hint="builder_summary")
+    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)
@@ -140,7 +150,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     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")
+    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)
@@ -157,7 +167,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")
@@ -165,7 +177,7 @@ 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.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)
@@ -179,10 +191,11 @@ 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("--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)
@@ -191,7 +204,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     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.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)
@@ -201,7 +214,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     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")
+    views_apply_apply.set_defaults(handler=_handle_views_apply, format_hint="builder_summary", force_json_output=True)
 
     flow_apply = builder_subparsers.add_parser("flow", help="流程")
     flow_apply_subparsers = flow_apply.add_subparsers(dest="builder_flow_command", required=True)
@@ -211,7 +224,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     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")
+    flow_apply_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)
@@ -221,14 +234,14 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     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.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("--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)
@@ -276,6 +289,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,
@@ -319,6 +336,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):
@@ -451,6 +472,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())
@@ -528,9 +577,13 @@ def _handle_charts_apply(args: argparse.Namespace, context: CliContext) -> dict:
 
 
 def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    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.",
@@ -549,6 +602,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,
@@ -556,6 +610,7 @@ 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,
     )
 
 

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

@@ -13,7 +13,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     record_subparsers = parser.add_subparsers(
         dest="record_command",
         required=True,
-        metavar="{schema,list,access,get,insert,update,delete,member-candidates,department-candidates,code-block-run}",
+        metavar="{schema,list,access,get,logs,insert,update,delete,member-candidates,department-candidates,code-block-run}",
     )
 
     schema = record_subparsers.add_parser("schema", help="读取记录相关表结构")
@@ -102,6 +102,12 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     get.add_argument("--view-id")
     get.set_defaults(handler=_handle_get, format_hint="record_get")
 
+    logs = record_subparsers.add_parser("logs", help="读取单条记录全量日志并写入本地 JSONL")
+    logs.add_argument("--app-key", required=True)
+    logs.add_argument("--record-id", required=True)
+    logs.add_argument("--view-id")
+    logs.set_defaults(handler=_handle_logs, format_hint="record_logs")
+
     insert = record_subparsers.add_parser("insert", help="新增记录")
     insert.add_argument("--app-key", required=True)
     insert.add_argument("--fields-file", help=argparse.SUPPRESS)
@@ -328,6 +334,15 @@ def _handle_get(args: argparse.Namespace, context: CliContext) -> dict:
     )
 
 
+def _handle_logs(args: argparse.Namespace, context: CliContext) -> dict:
+    return context.record.record_logs_get(
+        profile=args.profile,
+        app_key=args.app_key,
+        record_id=args.record_id,
+        view_id=args.view_id,
+    )
+
+
 def _handle_insert(args: argparse.Namespace, context: CliContext) -> dict:
     if args.items_file:
         if args.fields_file:

package/src/qingflow_mcp/cli/formatters.py

@@ -292,6 +292,37 @@ def _format_record_get(result: dict[str, Any]) -> str:
     return "\n".join(lines) + "\n"
 
 
+def _format_record_logs(result: dict[str, Any]) -> str:
+    app = result.get("app") if isinstance(result.get("app"), dict) else {}
+    view = result.get("view") if isinstance(result.get("view"), dict) else {}
+    record = result.get("record") if isinstance(result.get("record"), dict) else {}
+    data_logs = result.get("data_logs") if isinstance(result.get("data_logs"), dict) else {}
+    workflow_logs = result.get("workflow_logs") if isinstance(result.get("workflow_logs"), dict) else {}
+    integrity = result.get("context_integrity") if isinstance(result.get("context_integrity"), dict) else {}
+    lines = [
+        f"Status: {result.get('status') or '-'}",
+        f"App: {app.get('app_name') or app.get('app_key') or '-'} ({app.get('app_key') or '-'})",
+        f"View: {view.get('name') or view.get('view_id') or '-'}",
+        f"Record: {record.get('title') or '-'} ({record.get('record_id') or '-'})",
+        f"Data logs: {data_logs.get('status') or '-'} / count={data_logs.get('items_count')} / pages={data_logs.get('pages_fetched')} / complete={data_logs.get('complete')}",
+        f"Workflow logs: {workflow_logs.get('status') or '-'} / count={workflow_logs.get('items_count')} / pages={workflow_logs.get('pages_fetched')} / complete={workflow_logs.get('complete')}",
+        f"Safe for full log conclusion: {integrity.get('safe_for_full_log_conclusion')}",
+    ]
+    if result.get("local_dir"):
+        lines.append(f"Local dir: {result.get('local_dir')}")
+    if data_logs.get("local_path"):
+        lines.append(f"Data logs file: {data_logs.get('local_path')}")
+    if workflow_logs.get("local_path"):
+        lines.append(f"Workflow logs file: {workflow_logs.get('local_path')}")
+    if result.get("summary_path"):
+        lines.append(f"Summary file: {result.get('summary_path')}")
+    _append_warnings(lines, result.get("warnings"))
+    unavailable = result.get("unavailable_context") if isinstance(result.get("unavailable_context"), list) else []
+    if unavailable:
+        lines.append(f"Unavailable contexts: {len(unavailable)}")
+    return "\n".join(lines) + "\n"
+
+
 def _format_task_list(result: dict[str, Any]) -> str:
     data = result.get("data") if isinstance(result.get("data"), dict) else {}
     items = data.get("items") if isinstance(data.get("items"), list) else []
@@ -788,11 +819,11 @@ _FORMATTERS = {
     "workspace_get": _format_workspace_get,
     "workspace_select": _format_workspace_select,
     "app_list": _format_app_items,
-    "app_search": _format_app_items,
     "app_get": _format_app_get,
     "record_list": _format_record_list,
     "record_access": _format_record_access,
     "record_get": _format_record_get,
+    "record_logs": _format_record_logs,
     "task_list": _format_task_list,
     "task_workbench": _format_task_workbench,
     "task_get": _format_task_get,

package/src/qingflow_mcp/cli/main.py

@@ -8,6 +8,7 @@ from typing import Any, Callable, TextIO
 from ..errors import QingflowApiError
 from ..public_surface import cli_public_tool_spec_from_namespace
 from ..response_trim import resolve_cli_tool_name, trim_error_response, trim_public_response
+from ..tools.ai_builder_tools import _attach_builder_apply_envelope
 from .context import CliContext, build_cli_context
 from .formatters import emit_json_result, emit_text_result
 from .commands import register_all_commands
@@ -16,8 +17,21 @@ from .commands import register_all_commands
 Handler = Callable[[argparse.Namespace, CliContext], dict[str, Any]]
 
 
+class _CliArgumentError(Exception):
+    def __init__(self, *, prog: str, message: str, usage: str) -> None:
+        super().__init__(message)
+        self.prog = prog
+        self.message = message
+        self.usage = usage
+
+
+class _QingflowArgumentParser(argparse.ArgumentParser):
+    def error(self, message: str) -> None:
+        raise _CliArgumentError(prog=self.prog, message=message, usage=self.format_usage())
+
+
 def build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(prog="qingflow", description="Qingflow CLI")
+    parser = _QingflowArgumentParser(prog="qingflow", description="Qingflow CLI")
     parser.add_argument("--profile", default="default", help="会话 profile，默认 default")
     parser.add_argument("--json", action="store_true", help="输出 JSON")
     subparsers = parser.add_subparsers(dest="command", required=True)
@@ -42,6 +56,21 @@ def run(
     normalized_argv = _normalize_global_args(list(argv) if argv is not None else sys.argv[1:])
     try:
         args = parser.parse_args(normalized_argv)
+    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_argv(normalized_argv, payload)
+            emit_json_result(payload, stream=out)
+            return 2
+        err.write(exc.usage)
+        err.write(f"{exc.prog}: error: {exc.message}\n")
+        return 2
     except SystemExit as exc:
         return int(exc.code or 0)
     setattr(args, "_stdin", sys.stdin)
@@ -51,8 +80,10 @@ def run(
     if handler is None:
         parser.print_help(out)
         return 2
-    context = context_factory()
     try:
+        if _should_force_json_output(args):
+            setattr(args, "json", True)
+        context = context_factory()
         if not bool(args.json):
             _emit_cli_effective_context_notice(args, context, stream=err)
         result = handler(args, context)
@@ -60,12 +91,15 @@ def run(
         return int(exc.code or 0)
     except RuntimeError as exc:
         payload = trim_error_response(_parse_error_payload(exc))
+        payload = _maybe_attach_builder_apply_error_envelope_from_args(args, payload)
         return _emit_error(payload, json_mode=bool(args.json), stdout=out, stderr=err)
     except QingflowApiError as exc:
         payload = trim_error_response(exc.to_dict())
+        payload = _maybe_attach_builder_apply_error_envelope_from_args(args, payload)
         return _emit_error(payload, json_mode=bool(args.json), stdout=out, stderr=err)
     finally:
-        context.close()
+        if "context" in locals():
+            context.close()
 
     exit_code = _result_exit_code(result)
     trimmed_result = trim_public_response(resolve_cli_tool_name(args), result) if isinstance(result, dict) else result
@@ -104,6 +138,173 @@ def _normalize_global_args(argv: list[str]) -> list[str]:
     return global_args + remaining
 
 
+def _should_force_json_output(args: argparse.Namespace) -> bool:
+    if bool(getattr(args, "force_json_output", False)):
+        return True
+    if (
+        getattr(args, "command", "") == "builder"
+        and getattr(args, "builder_app_command", "") == "repair-code-blocks"
+        and bool(getattr(args, "apply", False))
+    ):
+        return True
+    return False
+
+
+def _should_force_json_output_argv(argv: list[str]) -> bool:
+    tokens = _strip_global_args(argv)
+    if not tokens or tokens[0] not in {"builder", "build"}:
+        return False
+    if len(tokens) < 3:
+        return False
+    section = tokens[1]
+    action = tokens[2]
+    if section in {"package", "button", "associated-resource", "associated-resources", "portal", "schema", "layout", "views", "flow", "charts"}:
+        return action == "apply"
+    if section == "publish":
+        return action == "verify"
+    if section == "app":
+        if action == "release-edit-lock-if-mine":
+            return True
+        if action == "repair-code-blocks":
+            return "--apply" in tokens
+    return False
+
+
+def _maybe_attach_builder_apply_error_envelope_from_args(args: argparse.Namespace, payload: dict[str, Any]) -> dict[str, Any]:
+    operation = _builder_apply_operation_from_args(args)
+    if not operation:
+        return payload
+    enriched = dict(payload)
+    enriched.setdefault("status", "failed")
+    enriched.setdefault("ok", False)
+    enriched.setdefault("write_executed", False)
+    enriched.setdefault("safe_to_retry", False)
+    _copy_arg_identity(enriched, args)
+    return _attach_builder_apply_envelope(operation, enriched)
+
+
+def _maybe_attach_builder_apply_error_envelope_from_argv(argv: list[str], payload: dict[str, Any]) -> dict[str, Any]:
+    operation = _builder_apply_operation_from_argv(argv)
+    if not operation:
+        return payload
+    enriched = dict(payload)
+    enriched.setdefault("status", "failed")
+    enriched.setdefault("ok", False)
+    enriched.setdefault("write_executed", False)
+    enriched.setdefault("safe_to_retry", False)
+    _copy_argv_identity(enriched, argv)
+    return _attach_builder_apply_envelope(operation, enriched)
+
+
+def _builder_apply_operation_from_args(args: argparse.Namespace) -> str | None:
+    if getattr(args, "command", "") not in {"builder", "build"}:
+        return None
+    section = str(getattr(args, "builder_command", "") or "")
+    if section == "package" and getattr(args, "builder_package_command", "") == "apply":
+        return "package_apply"
+    if section == "button" and getattr(args, "builder_button_command", "") == "apply":
+        return "app_custom_buttons_apply"
+    if section in {"associated-resource", "associated-resources"} and getattr(args, "builder_associated_resource_command", "") == "apply":
+        return "app_associated_resources_apply"
+    if section == "portal" and getattr(args, "builder_portal_command", "") == "apply":
+        return "portal_apply"
+    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":
+        return "app_flow_apply"
+    if section == "charts" and getattr(args, "builder_charts_command", "") == "apply":
+        return "app_charts_apply"
+    if section == "publish" and getattr(args, "builder_publish_command", "") == "verify":
+        return "app_publish_verify"
+    return None
+
+
+def _builder_apply_operation_from_argv(argv: list[str]) -> str | None:
+    tokens = _strip_global_args(argv)
+    if not tokens or tokens[0] not in {"builder", "build"} or len(tokens) < 3:
+        return None
+    section = tokens[1]
+    action = tokens[2]
+    if action != "apply" and not (section == "publish" and action == "verify"):
+        return None
+    mapping = {
+        "package": "package_apply",
+        "button": "app_custom_buttons_apply",
+        "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",
+        "publish": "app_publish_verify",
+    }
+    return mapping.get(section)
+
+
+def _copy_arg_identity(payload: dict[str, Any], args: argparse.Namespace) -> None:
+    for attr, key in (
+        ("app_key", "app_key"),
+        ("app_name", "app_name"),
+        ("app_title", "app_title"),
+        ("package_id", "package_id"),
+        ("dash_key", "dash_key"),
+        ("dash_name", "dash_name"),
+    ):
+        value = getattr(args, attr, None)
+        if value not in (None, ""):
+            payload.setdefault(key, value)
+
+
+def _copy_argv_identity(payload: dict[str, Any], argv: list[str]) -> None:
+    tokens = _strip_global_args(argv)
+    option_to_key = {
+        "--app-key": "app_key",
+        "--app-name": "app_name",
+        "--app-title": "app_title",
+        "--package-id": "package_id",
+        "--dash-key": "dash_key",
+        "--dash-name": "dash_name",
+    }
+    index = 0
+    while index < len(tokens):
+        token = tokens[index]
+        if token in option_to_key and index + 1 < len(tokens):
+            payload.setdefault(option_to_key[token], tokens[index + 1])
+            index += 2
+            continue
+        for option, key in option_to_key.items():
+            prefix = f"{option}="
+            if token.startswith(prefix):
+                payload.setdefault(key, token[len(prefix) :])
+                break
+        index += 1
+
+
+def _strip_global_args(argv: list[str]) -> list[str]:
+    stripped: list[str] = []
+    index = 0
+    while index < len(argv):
+        token = argv[index]
+        if token == "--json":
+            index += 1
+            continue
+        if token == "--profile":
+            index += 2
+            continue
+        if token.startswith("--profile="):
+            index += 1
+            continue
+        stripped.append(token)
+        index += 1
+    return stripped
+
+
 def _parse_error_payload(exc: RuntimeError) -> dict[str, Any]:
     raw = str(exc)
     try:

package/src/qingflow_mcp/public_surface.py

@@ -38,7 +38,6 @@ USER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
     PublicToolSpec(USER_DOMAIN, "workspace_get", ("workspace_get",), ("workspace", "get")),
     PublicToolSpec(USER_DOMAIN, "workspace_select", ("workspace_select",), ("workspace", "select")),
     PublicToolSpec(USER_DOMAIN, "app_list", ("app_list",), ("app", "list"), cli_show_effective_context=True),
-    PublicToolSpec(USER_DOMAIN, "app_search", ("app_search",), ("app", "search"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "app_get", ("app_get",), ("app", "get"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "portal_list", ("portal_list",), ("portal", "list"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "portal_get", ("portal_get",), ("portal", "get"), cli_show_effective_context=True),
@@ -84,6 +83,7 @@ USER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
     PublicToolSpec(USER_DOMAIN, "record_list", ("record_list",), ("record", "list"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "record_access", ("record_access",), ("record", "access"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "record_get", ("record_get_public",), ("record", "get"), cli_show_effective_context=True),
+    PublicToolSpec(USER_DOMAIN, "record_logs_get", ("record_logs_get",), ("record", "logs"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "record_insert", ("record_insert_public",), ("record", "insert"), cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(USER_DOMAIN, "record_update", ("record_update_public",), ("record", "update"), cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(USER_DOMAIN, "record_delete", ("record_delete_public",), ("record", "delete"), cli_show_effective_context=True, cli_context_write=True),
@@ -127,6 +127,8 @@ BUILDER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
     PublicToolSpec(BUILDER_DOMAIN, "file_upload_local", ("file_upload_local",), ("builder", "file", "upload-local"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "feedback_submit", ("feedback_submit",), ("builder", "feedback", "submit"), has_contract=True),
     PublicToolSpec(BUILDER_DOMAIN, "builder_tool_contract", ("builder_tool_contract",), ("builder", "contract"), has_contract=False),
+    PublicToolSpec(BUILDER_DOMAIN, "workspace_icon_catalog_get", ("workspace_icon_catalog_get",), ("builder", "icon", "catalog"), has_contract=True, cli_show_effective_context=True),
+    PublicToolSpec(BUILDER_DOMAIN, "package_list", ("package_list",), ("builder", "package", "list"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "package_get", ("package_get",), ("builder", "package", "get"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "package_apply", ("package_apply",), ("builder", "package", "apply"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "solution_install", ("solution_install",), ("builder", "solution", "install"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),