@josephyan/qingflow-cli 0.2.0-beta.69 → 0.2.0-beta.70

package/src/qingflow_mcp/cli/formatters.py

@@ -35,12 +35,33 @@ def _format_generic(result: dict[str, Any]) -> str:
 
 def _format_whoami(result: dict[str, Any]) -> str:
     lines = [
-        f"Profile: {result.get('profile')}",
         f"User: {result.get('nick_name') or '-'} ({result.get('email') or '-'})",
         f"UID: {result.get('uid')}",
         f"Workspace: {result.get('selected_ws_name') or '-'} ({result.get('selected_ws_id') or '-'})",
-        f"Base URL: {result.get('base_url')}",
+        f"QF Version: {result.get('qf_version') or '-'}",
     ]
+    lines.append(f"Permission Level: {result.get('permission_level') or '-'}")
+    departments = result.get("departments") if isinstance(result.get("departments"), list) else []
+    roles = result.get("roles") if isinstance(result.get("roles"), list) else []
+    if departments:
+        lines.append(
+            "Departments: "
+            + ", ".join(
+                str(item.get("dept_name") or item.get("dept_id"))
+                for item in departments
+                if isinstance(item, dict)
+            )
+        )
+    if roles:
+        lines.append(
+            "Roles: "
+            + ", ".join(
+                str(item.get("role_name") or item.get("role_id"))
+                for item in roles
+                if isinstance(item, dict)
+            )
+        )
+    _append_warnings(lines, result.get("warnings"))
     return "\n".join(lines) + "\n"
 
 
@@ -93,6 +114,15 @@ def _format_app_get(result: dict[str, Any]) -> str:
             f"{import_capability.get('auth_source') or 'unknown'} / "
             f"can_import={import_capability.get('can_import')}"
         )
+    editability = data.get("editability") if isinstance(data.get("editability"), dict) else {}
+    if editability:
+        lines.append(
+            "Editability: "
+            f"form={editability.get('can_edit_form')} / "
+            f"flow={editability.get('can_edit_flow')} / "
+            f"views={editability.get('can_edit_views')} / "
+            f"charts={editability.get('can_edit_charts')}"
+        )
     views = data.get("accessible_views") if isinstance(data.get("accessible_views"), list) else []
     lines.append(f"Accessible Views: {len(views)}")
     for item in views[:10]:
@@ -102,6 +132,25 @@ def _format_app_get(result: dict[str, Any]) -> str:
     return "\n".join(lines) + "\n"
 
 
+def _format_workspace_select(result: dict[str, Any]) -> str:
+    lines = [
+        f"Workspace: {result.get('selected_ws_name') or '-'} ({result.get('selected_ws_id') or '-'})",
+        f"QF Version: {result.get('qf_version') or '-'}",
+    ]
+    workspace_version = result.get("workspace_version") if isinstance(result.get("workspace_version"), dict) else {}
+    if workspace_version:
+        lines.append(
+            "Workspace Version: "
+            f"{workspace_version.get('display_name') or '-'} "
+            f"({workspace_version.get('level_name') or workspace_version.get('level_code') or '-'})"
+        )
+        if workspace_version.get("being_trial") is not None:
+            lines.append(f"Trial: {workspace_version.get('being_trial')}")
+        if workspace_version.get("expire_date") is not None:
+            lines.append(f"Expire Date: {workspace_version.get('expire_date')}")
+    return "\n".join(lines) + "\n"
+
+
 def _format_record_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 []
@@ -293,6 +342,7 @@ def _first_present(payload: dict[str, Any], *keys: str) -> Any:
 _FORMATTERS = {
     "auth_whoami": _format_whoami,
     "workspace_list": _format_workspace_list,
+    "workspace_select": _format_workspace_select,
     "app_list": _format_app_items,
     "app_search": _format_app_items,
     "app_get": _format_app_get,

package/src/qingflow_mcp/cli/main.py

@@ -6,6 +6,7 @@ import sys
 from typing import Any, Callable, TextIO
 
 from ..errors import QingflowApiError
+from ..response_trim import resolve_cli_tool_name, trim_error_response, trim_public_response
 from .context import CliContext, build_cli_context
 from .formatters import emit_json_result, emit_text_result
 from .commands import register_all_commands
@@ -17,7 +18,7 @@ Handler = Callable[[argparse.Namespace, CliContext], dict[str, Any]]
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="qingflow", description="Qingflow CLI")
     parser.add_argument("--profile", default="default", help="会话 profile，默认 default")
-    parser.add_argument("--json", action="store_true", help="输出原始 JSON")
+    parser.add_argument("--json", action="store_true", help="输出 JSON")
     subparsers = parser.add_subparsers(dest="command", required=True)
     register_all_commands(subparsers)
     return parser
@@ -50,20 +51,21 @@ def run(
     try:
         result = handler(args, context)
     except RuntimeError as exc:
-        payload = _parse_error_payload(exc)
+        payload = trim_error_response(_parse_error_payload(exc))
         return _emit_error(payload, json_mode=bool(args.json), stdout=out, stderr=err)
     except QingflowApiError as exc:
-        payload = exc.to_dict()
+        payload = trim_error_response(exc.to_dict())
         return _emit_error(payload, json_mode=bool(args.json), stdout=out, stderr=err)
     finally:
         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
     stream = out if bool(args.json) or exit_code == 0 else err
     if bool(args.json):
-        emit_json_result(result, stream=stream)
+        emit_json_result(trimmed_result, stream=stream)
     else:
-        emit_text_result(result, hint=getattr(args, "format_hint", ""), stream=stream)
+        emit_text_result(trimmed_result, hint=getattr(args, "format_hint", ""), stream=stream)
     return exit_code