@qingflow-tech/qingflow-cli 1.1.61 → 1.1.62-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/package.json +2 -1
- package/pyproject.toml +4 -1
- package/skills/qingflow-cli/SKILL.md +112 -3
- package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_CHARTS_WORKFLOW.md +1 -1
- package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_PORTAL_WORKFLOW.md +6 -258
- package/skills/qingflow-cli/reference/builder/20-build-complete-system.md +3 -3
- package/skills/qingflow-cli/reference/builder/30-schema-fields.md +22 -5
- package/skills/qingflow-cli/reference/builder/70-portal.md +111 -36
- package/skills/qingflow-cli/reference/builder/README.md +2 -2
- package/skills/qingflow-cli/reference/builder/reference/app-delivery-sop.md +3 -3
- package/skills/qingflow-cli/reference/examples/portal/portal_apply_v1alpha1.example.json +100 -0
- package/skills/qingflow-cli/reference/examples/portal/portal_sections_all_types.example.json +22 -6
- package/src/qingflow_mcp/app_form_compat.py +3 -0
- package/src/qingflow_mcp/app_form_validator.py +89 -20
- package/src/qingflow_mcp/builder_facade/app_form.py +629 -112
- package/src/qingflow_mcp/builder_facade/models.py +213 -15
- package/src/qingflow_mcp/builder_facade/portals_schema.py +397 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/manifest.json +15 -1
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/complete.json +112 -38
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/address.json +31 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_classification.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_extraction.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_generation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_document_parsing.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_generation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_recognition.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_machine_translation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_text_summary.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/amount.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/attachment.json +33 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/code_block.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/data_relation.json +11 -18
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date_duration.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/datetime.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/department.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/email.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/embed_field.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/image_select.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/link.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/location.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/long_text.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/member.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/multi_select.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/number.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ocr.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/phone.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/q_linker.json +8 -12
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/relation.json +73 -15
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/rich_text.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_choice.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_select.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/subtable.json +90 -29
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/text.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/formula.json +43 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/summary.json +27 -19
- package/src/qingflow_mcp/builder_facade/schemas/portals/manifest.json +59 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/complete.json +1397 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/carousel.json +193 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/chart.json +643 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/favourite.json +203 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/filter.json +331 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/grid.json +265 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/link.json +131 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/task.json +199 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/text.json +123 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/view.json +196 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/summary.json +800 -0
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/complete.json +1 -1
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/details/display.json +1 -1
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/summary.json +1 -1
- package/src/qingflow_mcp/builder_facade/service.py +1367 -92
- package/src/qingflow_mcp/cli/commands/builder.py +120 -5
- package/src/qingflow_mcp/cli/formatters.py +11 -0
- package/src/qingflow_mcp/cli/main.py +90 -2
- package/src/qingflow_mcp/cli/permission_gate.py +59 -0
- package/src/qingflow_mcp/cloud_context.py +16 -1
- package/src/qingflow_mcp/entity_permissions.py +10 -0
- package/src/qingflow_mcp/permission_catalog.json +1210 -0
- package/src/qingflow_mcp/public_surface.py +69 -8
- package/src/qingflow_mcp/response_trim.py +2 -1
- package/src/qingflow_mcp/server.py +12 -6
- package/src/qingflow_mcp/server_app_builder.py +43 -10
- package/src/qingflow_mcp/server_app_user.py +9 -5
- package/src/qingflow_mcp/server_cloud.py +43 -7
- package/src/qingflow_mcp/session_store.py +14 -1
- package/src/qingflow_mcp/solution/compiler/icon_utils.py +73 -0
- package/src/qingflow_mcp/solution/executor.py +5 -2
- package/src/qingflow_mcp/tool_catalog.py +388 -0
- package/src/qingflow_mcp/tool_catalog_i18n.py +184 -0
- package/src/qingflow_mcp/tool_policy.py +191 -0
- package/src/qingflow_mcp/tools/ai_builder_tools.py +118 -20
- package/src/qingflow_mcp/tools/base.py +1 -0
- package/src/qingflow_mcp/tools/portal_tools.py +4 -54
- package/src/qingflow_mcp/tools/portal_writer.py +59 -0
- package/src/qingflow_mcp/tools/solution_tools.py +2 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
from __future__ import annotations
|
|
2
2
|
|
|
3
3
|
import argparse
|
|
4
|
+
import sys
|
|
4
5
|
from copy import deepcopy
|
|
5
6
|
from pathlib import Path
|
|
6
7
|
|
|
@@ -18,6 +19,7 @@ from ...app_form_validator import (
|
|
|
18
19
|
validate_declaration,
|
|
19
20
|
validate_formula_expression,
|
|
20
21
|
)
|
|
22
|
+
from ...builder_facade.portals_schema import PORTALS_SUPPORTED_SCHEMA_KINDS
|
|
21
23
|
from ...builder_facade.views_schema import VIEWS_SUPPORTED_SCHEMA_KINDS
|
|
22
24
|
from ..context import CliContext
|
|
23
25
|
from ..json_io import load_json_value
|
|
@@ -260,17 +262,38 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
|
|
|
260
262
|
portal_list = portal_subparsers.add_parser("list", help="列出可配置门户")
|
|
261
263
|
portal_list.set_defaults(handler=_handle_portal_list, format_hint="builder_summary")
|
|
262
264
|
|
|
263
|
-
|
|
265
|
+
portal_schema = portal_subparsers.add_parser("schema", help="读取门户声明 Schema")
|
|
266
|
+
portal_schema.add_argument("--schema-version")
|
|
267
|
+
portal_schema.add_argument(
|
|
268
|
+
"--schema-kind",
|
|
269
|
+
choices=PORTALS_SUPPORTED_SCHEMA_KINDS,
|
|
270
|
+
)
|
|
271
|
+
portal_schema.set_defaults(handler=_handle_portal_schema, format_hint="builder_summary", force_json_output=True)
|
|
272
|
+
|
|
273
|
+
portal_get = portal_subparsers.add_parser("get", help="读取门户声明或详情")
|
|
264
274
|
portal_get.add_argument("--dash-key", required=True)
|
|
265
275
|
portal_get.add_argument("--being-draft", action=argparse.BooleanOptionalAction, default=True)
|
|
276
|
+
portal_get.add_argument(
|
|
277
|
+
"--schema-kind",
|
|
278
|
+
choices=("summary", "complete", "raw"),
|
|
279
|
+
default="summary",
|
|
280
|
+
help="summary/complete=canonical 声明投影(重放提取锦点);raw=原始归一响应",
|
|
281
|
+
)
|
|
282
|
+
portal_get.add_argument("--schema-version")
|
|
266
283
|
portal_get.set_defaults(handler=_handle_portal_get, format_hint="builder_summary")
|
|
267
284
|
|
|
285
|
+
portal_validate = portal_subparsers.add_parser("validate", help="只校验门户声明,不访问后端")
|
|
286
|
+
portal_validate.add_argument("--file", required=True, help="门户声明 JSON 文件,- 表示 stdin")
|
|
287
|
+
portal_validate.add_argument("--schema-version", help="固定使用的门户 Schema 版本;缺省读文件内 schema_version,再缺省 latest")
|
|
288
|
+
portal_validate.set_defaults(handler=_handle_portal_validate, format_hint="builder_summary", force_json_output=True)
|
|
289
|
+
|
|
268
290
|
portal_apply = portal_subparsers.add_parser("apply", help="更新门户")
|
|
291
|
+
portal_apply.add_argument("--file", help="声明文件主形态(完整 portal 声明 JSON,支持 - stdin);与 patch 参数互斥")
|
|
292
|
+
portal_apply.add_argument("--schema-version", help="声明使用的 Schema 版本;缺省读文件内 schema_version,再缺省 latest")
|
|
269
293
|
portal_apply.add_argument("--dash-key", default="")
|
|
270
294
|
portal_apply.add_argument("--dash-name", default="")
|
|
271
295
|
portal_apply.add_argument("--package-id", type=int)
|
|
272
|
-
portal_apply.add_argument("--
|
|
273
|
-
portal_apply.add_argument("--payload-file")
|
|
296
|
+
portal_apply.add_argument("--payload-file", help="兼容:完整门户 payload JSON(裸 DTO 透传);新代码改用 --file")
|
|
274
297
|
portal_apply.add_argument("--sections-file")
|
|
275
298
|
portal_apply.add_argument("--layout-preset", default="")
|
|
276
299
|
portal_apply.add_argument("--visibility-file")
|
|
@@ -981,8 +1004,36 @@ def _handle_portal_list(args: argparse.Namespace, context: CliContext) -> dict:
|
|
|
981
1004
|
return context.builder.portal_list(profile=args.profile)
|
|
982
1005
|
|
|
983
1006
|
|
|
1007
|
+
def _handle_portal_schema(args: argparse.Namespace, context: CliContext) -> dict:
|
|
1008
|
+
return context.builder.portal_schema(
|
|
1009
|
+
schema_version=getattr(args, "schema_version", None),
|
|
1010
|
+
schema_kind=getattr(args, "schema_kind", None),
|
|
1011
|
+
)
|
|
1012
|
+
|
|
1013
|
+
|
|
1014
|
+
def _handle_portal_validate(args: argparse.Namespace, context: CliContext) -> dict:
|
|
1015
|
+
payload = load_json_value(
|
|
1016
|
+
args.file,
|
|
1017
|
+
option_name="--file",
|
|
1018
|
+
max_bytes=2 * 1024 * 1024,
|
|
1019
|
+
max_depth=64,
|
|
1020
|
+
)
|
|
1021
|
+
if not isinstance(payload, dict):
|
|
1022
|
+
raise_config_error("builder portal validate --file must contain a JSON object")
|
|
1023
|
+
return context.builder.portal_validate(
|
|
1024
|
+
declaration=payload,
|
|
1025
|
+
schema_version=getattr(args, "schema_version", None),
|
|
1026
|
+
)
|
|
1027
|
+
|
|
1028
|
+
|
|
984
1029
|
def _handle_portal_get(args: argparse.Namespace, context: CliContext) -> dict:
|
|
985
|
-
return context.builder.portal_get(
|
|
1030
|
+
return context.builder.portal_get(
|
|
1031
|
+
profile=args.profile,
|
|
1032
|
+
dash_key=args.dash_key,
|
|
1033
|
+
being_draft=bool(args.being_draft),
|
|
1034
|
+
schema_kind=getattr(args, "schema_kind", "summary") or "summary",
|
|
1035
|
+
schema_version=getattr(args, "schema_version", None),
|
|
1036
|
+
)
|
|
986
1037
|
|
|
987
1038
|
|
|
988
1039
|
def _handle_view_get(args: argparse.Namespace, context: CliContext) -> dict:
|
|
@@ -1385,6 +1436,70 @@ def _handle_charts_apply(args: argparse.Namespace, context: CliContext) -> dict:
|
|
|
1385
1436
|
|
|
1386
1437
|
|
|
1387
1438
|
def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
|
|
1439
|
+
file_declaration = (
|
|
1440
|
+
load_json_value(args.file, option_name="--file", max_bytes=4 * 1024 * 1024, max_depth=64)
|
|
1441
|
+
if getattr(args, "file", None)
|
|
1442
|
+
else None
|
|
1443
|
+
)
|
|
1444
|
+
file_schema_version: str | None = None
|
|
1445
|
+
legacy_args_used = False
|
|
1446
|
+
if file_declaration is not None:
|
|
1447
|
+
if not isinstance(file_declaration, dict):
|
|
1448
|
+
raise_config_error("builder portal apply --file must contain a JSON object")
|
|
1449
|
+
legacy_keys = (
|
|
1450
|
+
getattr(args, "sections_file", None),
|
|
1451
|
+
getattr(args, "patch_sections_file", None),
|
|
1452
|
+
getattr(args, "visibility_file", None),
|
|
1453
|
+
getattr(args, "auth_file", None),
|
|
1454
|
+
getattr(args, "dash_global_config_file", None),
|
|
1455
|
+
getattr(args, "config_file", None),
|
|
1456
|
+
getattr(args, "payload_file", None),
|
|
1457
|
+
getattr(args, "icon", None),
|
|
1458
|
+
getattr(args, "color", None),
|
|
1459
|
+
(getattr(args, "dash_name", "") or ""),
|
|
1460
|
+
(getattr(args, "layout_preset", "") or ""),
|
|
1461
|
+
)
|
|
1462
|
+
if any(bool(item) for item in legacy_keys):
|
|
1463
|
+
raise_config_error(
|
|
1464
|
+
"builder portal apply --file cannot be combined with patch parameters.",
|
|
1465
|
+
fix_hint="Put the full declaration in the --file JSON; keep only --schema-version/--publish/--dash-key flags.",
|
|
1466
|
+
error_code="ARGUMENT_ERROR",
|
|
1467
|
+
)
|
|
1468
|
+
if getattr(args, "package_id", None) is not None:
|
|
1469
|
+
file_declaration.setdefault("package_tag_id", args.package_id)
|
|
1470
|
+
if getattr(args, "dash_key", ""):
|
|
1471
|
+
file_declaration["dash_key"] = args.dash_key
|
|
1472
|
+
file_schema_version = str(file_declaration.pop("schema_version", None) or file_declaration.pop("schemaVersion", None) or "").strip() or None
|
|
1473
|
+
effective_schema_version = getattr(args, "schema_version", None) or file_schema_version
|
|
1474
|
+
return context.builder.portal_apply(
|
|
1475
|
+
profile=args.profile,
|
|
1476
|
+
payload=file_declaration,
|
|
1477
|
+
schema_version=effective_schema_version,
|
|
1478
|
+
)
|
|
1479
|
+
# deprecation 提示仅在实际使用 patch 参数时打印(review §5 噪声收敛):
|
|
1480
|
+
# 纯 flag 调用(--dash-key/--publish/--schema-version/--package-id 定位或发布
|
|
1481
|
+
# 开关)不是 patch 形态,不该被提示;判定集与 --file 互斥检查的 patch 参数集一致。
|
|
1482
|
+
patch_args_used = any(
|
|
1483
|
+
bool(item)
|
|
1484
|
+
for item in (
|
|
1485
|
+
getattr(args, "sections_file", None),
|
|
1486
|
+
getattr(args, "patch_sections_file", None),
|
|
1487
|
+
getattr(args, "visibility_file", None),
|
|
1488
|
+
getattr(args, "auth_file", None),
|
|
1489
|
+
getattr(args, "dash_global_config_file", None),
|
|
1490
|
+
getattr(args, "config_file", None),
|
|
1491
|
+
getattr(args, "payload_file", None),
|
|
1492
|
+
getattr(args, "icon", None),
|
|
1493
|
+
getattr(args, "color", None),
|
|
1494
|
+
(getattr(args, "dash_name", "") or ""),
|
|
1495
|
+
(getattr(args, "layout_preset", "") or ""),
|
|
1496
|
+
)
|
|
1497
|
+
)
|
|
1498
|
+
if patch_args_used:
|
|
1499
|
+
print(
|
|
1500
|
+
"[deprecation] builder portal apply patch parameters are in a compatibility window; prefer `--file <declaration.json>`",
|
|
1501
|
+
file=sys.stderr,
|
|
1502
|
+
)
|
|
1388
1503
|
payload = load_object_arg(args.payload_file, option_name="--payload-file") if getattr(args, "payload_file", None) else None
|
|
1389
1504
|
payload_obj = payload if isinstance(payload, dict) else {}
|
|
1390
1505
|
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()
|
|
@@ -1413,7 +1528,6 @@ def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
|
|
|
1413
1528
|
dash_key=args.dash_key,
|
|
1414
1529
|
dash_name=args.dash_name,
|
|
1415
1530
|
package_id=args.package_id,
|
|
1416
|
-
publish=bool(args.publish),
|
|
1417
1531
|
sections=sections,
|
|
1418
1532
|
layout_preset=args.layout_preset,
|
|
1419
1533
|
visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
|
|
@@ -1424,6 +1538,7 @@ def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
|
|
|
1424
1538
|
dash_global_config=load_object_arg(args.dash_global_config_file, option_name="--dash-global-config-file"),
|
|
1425
1539
|
config=load_object_arg(args.config_file, option_name="--config-file"),
|
|
1426
1540
|
payload=payload,
|
|
1541
|
+
schema_version=getattr(args, "schema_version", None),
|
|
1427
1542
|
patch_sections=patch_sections,
|
|
1428
1543
|
)
|
|
1429
1544
|
|
|
@@ -72,6 +72,16 @@ def _format_failed_result(result: dict[str, Any]) -> str:
|
|
|
72
72
|
return "\n".join(lines) + "\n"
|
|
73
73
|
|
|
74
74
|
|
|
75
|
+
def _format_tool_permissions(result: dict[str, Any]) -> str:
|
|
76
|
+
lines = [f"策略状态:{result['mode']}"]
|
|
77
|
+
for key, label in (("allowed_tools", "允许工具"), ("denied_tools", "禁止工具"), ("exempt_tools", "豁免工具")):
|
|
78
|
+
lines.append(f"{label}:")
|
|
79
|
+
for row in result[key]:
|
|
80
|
+
commands = " / ".join("qingflow " + " ".join(item["route"]) for item in row["entrypoints"])
|
|
81
|
+
lines.append(f"- {row['id']}:{row['description']}({commands})")
|
|
82
|
+
return "\n".join(lines) + "\n"
|
|
83
|
+
|
|
84
|
+
|
|
75
85
|
def _format_generic(result: dict[str, Any]) -> str:
|
|
76
86
|
lines: list[str] = []
|
|
77
87
|
title = _first_present(result, "status", "message")
|
|
@@ -1727,6 +1737,7 @@ def _format_login_link(result: dict[str, Any]) -> str:
|
|
|
1727
1737
|
|
|
1728
1738
|
|
|
1729
1739
|
_FORMATTERS = {
|
|
1740
|
+
"tool_permissions": _format_tool_permissions,
|
|
1730
1741
|
"login_link": _format_login_link,
|
|
1731
1742
|
"auth_whoami": _format_whoami,
|
|
1732
1743
|
"workspace_list": _format_workspace_list,
|
|
@@ -7,12 +7,26 @@ import sys
|
|
|
7
7
|
from typing import Any, Callable, TextIO
|
|
8
8
|
|
|
9
9
|
from ..errors import QingflowApiError, backend_code_value_int, message_looks_like_invalid_token
|
|
10
|
-
from ..public_surface import
|
|
10
|
+
from ..public_surface import (
|
|
11
|
+
NON_TOOL_CLI_HANDLER_ROUTES,
|
|
12
|
+
PUBLIC_TOOL_BY_CLI_ROUTE,
|
|
13
|
+
cli_public_tool_spec_from_namespace,
|
|
14
|
+
cli_route_from_namespace,
|
|
15
|
+
cli_trim_key_from_namespace,
|
|
16
|
+
)
|
|
11
17
|
from ..resource_uri import cli_resource_base_url
|
|
12
18
|
from ..response_trim import resolve_cli_tool_name, trim_error_response, trim_public_response
|
|
13
19
|
from ..tools.ai_builder_tools import _attach_builder_apply_envelope
|
|
14
20
|
from ..version import get_cli_version, get_cli_version_info
|
|
21
|
+
from ..tool_catalog import TOOL_DESCRIPTIONS, tool_is_exempt
|
|
22
|
+
from ..tool_policy import (
|
|
23
|
+
TOOL_POLICY_INVALID,
|
|
24
|
+
ToolPolicySnapshot,
|
|
25
|
+
ToolPolicyViolation,
|
|
26
|
+
read_current_tool_policy,
|
|
27
|
+
)
|
|
15
28
|
from .context import CliContext, build_cli_context
|
|
29
|
+
from .permission_gate import guard_cli_context
|
|
16
30
|
from .formatters import emit_json_result, emit_text_result
|
|
17
31
|
from .commands import register_all_commands
|
|
18
32
|
|
|
@@ -41,6 +55,10 @@ def build_parser() -> argparse.ArgumentParser:
|
|
|
41
55
|
subparsers = parser.add_subparsers(dest="command", required=True)
|
|
42
56
|
version_parser = subparsers.add_parser("version", help="输出 Qingflow CLI 版本")
|
|
43
57
|
version_parser.set_defaults(handler=_handle_version, format_hint="version")
|
|
58
|
+
tools_parser = subparsers.add_parser("tools", help="查看当前 CLI 的工具授权")
|
|
59
|
+
tools_commands = tools_parser.add_subparsers(dest="tools_command", required=True)
|
|
60
|
+
permissions_parser = tools_commands.add_parser("permissions", help="只读查看本轮允许、禁止及豁免工具,不初始化认证")
|
|
61
|
+
permissions_parser.set_defaults(handler=_handle_tools_permissions)
|
|
44
62
|
register_all_commands(subparsers)
|
|
45
63
|
return parser
|
|
46
64
|
|
|
@@ -90,16 +108,41 @@ def run(
|
|
|
90
108
|
if handler is None:
|
|
91
109
|
parser.print_help(out)
|
|
92
110
|
return 2
|
|
111
|
+
if cli_route_from_namespace(args) == ("tools", "permissions"):
|
|
112
|
+
# 工具开关自省只解析调用方参数,不初始化业务上下文。
|
|
113
|
+
result = _handle_tools_permissions(args, None)
|
|
114
|
+
if result["status"] == "failed":
|
|
115
|
+
return _emit_error(result, json_mode=bool(args.json), stdout=out, stderr=err)
|
|
116
|
+
if args.json:
|
|
117
|
+
emit_json_result(result, stream=out)
|
|
118
|
+
else:
|
|
119
|
+
emit_text_result(result, hint="tool_permissions", stream=out)
|
|
120
|
+
return 0
|
|
121
|
+
stable_id = cli_trim_key_from_namespace(args)
|
|
122
|
+
snapshot = ToolPolicySnapshot("unrestricted") if stable_id and tool_is_exempt(stable_id) else read_current_tool_policy()
|
|
123
|
+
violation = _cli_tool_policy_violation(args, snapshot)
|
|
124
|
+
if violation is not None:
|
|
125
|
+
return _emit_error(
|
|
126
|
+
violation.payload(),
|
|
127
|
+
json_mode=bool(args.json),
|
|
128
|
+
stdout=out,
|
|
129
|
+
stderr=err,
|
|
130
|
+
)
|
|
93
131
|
try:
|
|
94
132
|
if _should_force_json_output(args):
|
|
95
133
|
setattr(args, "json", True)
|
|
96
|
-
|
|
134
|
+
stable_id = cli_trim_key_from_namespace(args)
|
|
135
|
+
context = guard_cli_context(context_factory(),
|
|
136
|
+
domain=stable_id.split(":", 1)[0] if stable_id else "user",
|
|
137
|
+
entry_tool_id=stable_id)
|
|
97
138
|
if not bool(args.json):
|
|
98
139
|
_emit_cli_effective_context_notice(args, context, stream=err)
|
|
99
140
|
with cli_resource_base_url(os.getenv("QINGFLOW_BASE_URL") or ""):
|
|
100
141
|
result = handler(args, context)
|
|
101
142
|
except SystemExit as exc:
|
|
102
143
|
return int(exc.code or 0)
|
|
144
|
+
except ToolPolicyViolation as exc:
|
|
145
|
+
return _emit_error(exc.payload(), json_mode=bool(args.json), stdout=out, stderr=err)
|
|
103
146
|
except RuntimeError as exc:
|
|
104
147
|
payload = trim_error_response(_parse_error_payload(exc))
|
|
105
148
|
payload = _maybe_attach_builder_apply_error_envelope_from_args(args, payload)
|
|
@@ -122,6 +165,51 @@ def run(
|
|
|
122
165
|
return exit_code
|
|
123
166
|
|
|
124
167
|
|
|
168
|
+
def _cli_tool_policy_violation(args: argparse.Namespace, snapshot: ToolPolicySnapshot | None = None) -> ToolPolicyViolation | None:
|
|
169
|
+
stable_id = cli_trim_key_from_namespace(args)
|
|
170
|
+
if stable_id is None:
|
|
171
|
+
# 仅显式登记的非业务分发器可跳过闸门;无子命令的新增 handler 也必须默认拒绝。
|
|
172
|
+
if cli_route_from_namespace(args) in NON_TOOL_CLI_HANDLER_ROUTES:
|
|
173
|
+
return None
|
|
174
|
+
return ToolPolicyViolation(
|
|
175
|
+
TOOL_POLICY_INVALID,
|
|
176
|
+
"user:unregistered",
|
|
177
|
+
"CLI 业务命令未登记稳定工具 ID",
|
|
178
|
+
)
|
|
179
|
+
if tool_is_exempt(stable_id):
|
|
180
|
+
return None
|
|
181
|
+
return (snapshot or read_current_tool_policy()).violation_for(stable_id)
|
|
182
|
+
|
|
183
|
+
|
|
184
|
+
def _handle_tools_permissions(_args: argparse.Namespace, _context: CliContext | None) -> dict[str, Any]:
|
|
185
|
+
snapshot = read_current_tool_policy()
|
|
186
|
+
tools: dict[str, dict[str, Any]] = {}
|
|
187
|
+
# 只报告当前 CLI 实际可达的工具;未知策略 ID 不代表已安装相应能力。
|
|
188
|
+
for route, spec in sorted(PUBLIC_TOOL_BY_CLI_ROUTE.items()):
|
|
189
|
+
row = tools.setdefault(spec.trim_key, {
|
|
190
|
+
"id": spec.trim_key,
|
|
191
|
+
"description": TOOL_DESCRIPTIONS[spec.trim_key],
|
|
192
|
+
"entrypoints": [],
|
|
193
|
+
})
|
|
194
|
+
row["entrypoints"].append({"type": "cli", "route": list(route)})
|
|
195
|
+
result: dict[str, Any] = {
|
|
196
|
+
"status": "success",
|
|
197
|
+
"mode": snapshot.mode,
|
|
198
|
+
"allowed_tools": [],
|
|
199
|
+
"denied_tools": [],
|
|
200
|
+
"exempt_tools": [],
|
|
201
|
+
}
|
|
202
|
+
for stable_id, row in sorted(tools.items()):
|
|
203
|
+
if tool_is_exempt(stable_id):
|
|
204
|
+
group = "exempt_tools"
|
|
205
|
+
elif snapshot.violation_for(stable_id) is None:
|
|
206
|
+
group = "allowed_tools"
|
|
207
|
+
else:
|
|
208
|
+
group = "denied_tools"
|
|
209
|
+
result[group].append(row)
|
|
210
|
+
return result
|
|
211
|
+
|
|
212
|
+
|
|
125
213
|
def _handle_version(_args: argparse.Namespace, _context: CliContext) -> dict[str, Any]:
|
|
126
214
|
info = get_cli_version_info()
|
|
127
215
|
return {
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
from functools import wraps
|
|
4
|
+
from typing import Any
|
|
5
|
+
|
|
6
|
+
from ..public_surface import ALL_PUBLIC_TOOL_SPECS
|
|
7
|
+
from ..tool_catalog import tool_is_exempt
|
|
8
|
+
from ..tool_policy import read_current_tool_policy
|
|
9
|
+
|
|
10
|
+
_METHOD_IDS = {
|
|
11
|
+
domain: {method: spec.trim_key for spec in ALL_PUBLIC_TOOL_SPECS if spec.domain == domain
|
|
12
|
+
for method in (*spec.method_names, spec.tool_name)}
|
|
13
|
+
for domain in ("user", "builder")
|
|
14
|
+
}
|
|
15
|
+
_METHOD_IDS["builder"].update({
|
|
16
|
+
"app_form_evaluate_formula": "builder:app_form_validate_formula",
|
|
17
|
+
"app_form_run_code_block": "builder:app_form_validate_code_block",
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
class _GuardedFacade:
|
|
22
|
+
def __init__(self, target: Any, domain: str, *, workspace_selection: bool = False) -> None:
|
|
23
|
+
self._target, self._domain = target, domain
|
|
24
|
+
self._workspace_selection = workspace_selection
|
|
25
|
+
|
|
26
|
+
def __getattr__(self, name: str) -> Any:
|
|
27
|
+
method = getattr(self._target, name)
|
|
28
|
+
stable_id = _METHOD_IDS[self._domain].get(name)
|
|
29
|
+
if stable_id is None or not callable(method) or tool_is_exempt(stable_id):
|
|
30
|
+
return method
|
|
31
|
+
# 切换工作区是基础恢复入口,交互选择必须先读取候选项;独立列表命令仍受闸门约束。
|
|
32
|
+
if self._workspace_selection and stable_id == "user:workspace_list":
|
|
33
|
+
return method
|
|
34
|
+
|
|
35
|
+
@wraps(method)
|
|
36
|
+
def guarded(*args: Any, **kwargs: Any) -> Any:
|
|
37
|
+
# 交互命令可能长时间驻留,二次动作必须使用最新配置,不能沿用入口快照。
|
|
38
|
+
violation = read_current_tool_policy().violation_for(stable_id)
|
|
39
|
+
if violation is not None:
|
|
40
|
+
raise violation
|
|
41
|
+
return method(*args, **kwargs)
|
|
42
|
+
return guarded
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def guard_cli_context(context: Any, *, domain: str = "user", entry_tool_id: str | None = None) -> Any:
|
|
46
|
+
# 交互工作台中的二次动作仍按工具检查,不能仅凭工作台的查看许可执行写入。
|
|
47
|
+
for name in ("auth", "login_link", "workspace", "app", "resource", "record", "data", "code_block",
|
|
48
|
+
"imports", "exports", "task", "files", "builder_feedback", "builder"):
|
|
49
|
+
target = getattr(context, name, None)
|
|
50
|
+
if target is not None:
|
|
51
|
+
# 文件 facade 被两个域共用,按当前入口域检查;其他业务 facade 保持自身权限域。
|
|
52
|
+
facade_domain = domain if name == "files" else (
|
|
53
|
+
"builder" if name in {"builder", "builder_feedback"} else "user"
|
|
54
|
+
)
|
|
55
|
+
setattr(context, name, _GuardedFacade(
|
|
56
|
+
target, facade_domain,
|
|
57
|
+
workspace_selection=name == "workspace" and entry_tool_id == "user:workspace_select",
|
|
58
|
+
))
|
|
59
|
+
return context
|
|
@@ -2,11 +2,14 @@ from __future__ import annotations
|
|
|
2
2
|
|
|
3
3
|
from contextvars import ContextVar
|
|
4
4
|
from dataclasses import dataclass, field
|
|
5
|
-
from typing import Callable
|
|
5
|
+
from typing import TYPE_CHECKING, Callable
|
|
6
6
|
|
|
7
7
|
from .backend_client import BackendRequestContext
|
|
8
8
|
from .session_store import BackendSession, SessionProfile
|
|
9
9
|
|
|
10
|
+
if TYPE_CHECKING:
|
|
11
|
+
from .tool_policy import ToolPolicySnapshot
|
|
12
|
+
|
|
10
13
|
|
|
11
14
|
CLOUD_PROFILE_NAME = "__cloud_mcp__"
|
|
12
15
|
|
|
@@ -73,3 +76,15 @@ current_call_platform: ContextVar[str] = ContextVar(
|
|
|
73
76
|
"qingflow_mcp_current_call_platform",
|
|
74
77
|
default="",
|
|
75
78
|
)
|
|
79
|
+
|
|
80
|
+
# 远端 MCP 每个 HTTP 请求独立绑定策略原文;缺头用 None 表示,不回退进程环境变量。
|
|
81
|
+
current_tool_policy_header: ContextVar[str | None] = ContextVar(
|
|
82
|
+
"qingflow_mcp_current_tool_policy_header",
|
|
83
|
+
default=None,
|
|
84
|
+
)
|
|
85
|
+
|
|
86
|
+
# 在 HTTP 入口合成一次快照,列表与调用共用,避免将 URL 选择保存到会话或共享环境。
|
|
87
|
+
current_http_tool_policy: ContextVar[ToolPolicySnapshot | None] = ContextVar(
|
|
88
|
+
"qingflow_mcp_current_http_tool_policy",
|
|
89
|
+
default=None,
|
|
90
|
+
)
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"""实体档位只展示完整工具集,不承担字段级或资源差异授权。"""
|
|
2
|
+
from __future__ import annotations
|
|
3
|
+
|
|
4
|
+
import json
|
|
5
|
+
from pathlib import Path
|
|
6
|
+
from typing import Any
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
def permission_catalog() -> dict[str, Any]:
|
|
10
|
+
return json.loads(Path(__file__).with_name("permission_catalog.json").read_text(encoding="utf-8"))
|