@qingflow-tech/qingflow-cli 1.1.61 → 1.1.62-beta.1

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.
Files changed (95) hide show
  1. package/README.md +3 -3
  2. package/package.json +2 -1
  3. package/pyproject.toml +4 -1
  4. package/skills/qingflow-cli/SKILL.md +112 -3
  5. package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_CHARTS_WORKFLOW.md +1 -1
  6. package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_PORTAL_WORKFLOW.md +6 -258
  7. package/skills/qingflow-cli/reference/builder/20-build-complete-system.md +2 -2
  8. package/skills/qingflow-cli/reference/builder/30-schema-fields.md +22 -5
  9. package/skills/qingflow-cli/reference/builder/70-portal.md +111 -36
  10. package/skills/qingflow-cli/reference/builder/reference/app-delivery-sop.md +3 -3
  11. package/skills/qingflow-cli/reference/examples/portal/portal_apply_v1alpha1.example.json +100 -0
  12. package/skills/qingflow-cli/reference/examples/portal/portal_sections_all_types.example.json +22 -6
  13. package/src/qingflow_mcp/app_form_compat.py +3 -0
  14. package/src/qingflow_mcp/app_form_validator.py +89 -20
  15. package/src/qingflow_mcp/builder_facade/app_form.py +629 -112
  16. package/src/qingflow_mcp/builder_facade/models.py +213 -15
  17. package/src/qingflow_mcp/builder_facade/portals_schema.py +397 -0
  18. package/src/qingflow_mcp/builder_facade/schemas/app_form/manifest.json +15 -1
  19. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/complete.json +112 -38
  20. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/address.json +31 -8
  21. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_classification.json +146 -0
  22. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_extraction.json +146 -0
  23. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_generation.json +146 -0
  24. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_document_parsing.json +146 -0
  25. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_generation.json +146 -0
  26. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_recognition.json +146 -0
  27. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_machine_translation.json +146 -0
  28. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_text_summary.json +146 -0
  29. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/amount.json +6 -10
  30. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/attachment.json +33 -10
  31. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/code_block.json +6 -10
  32. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/data_relation.json +11 -18
  33. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date.json +4 -8
  34. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date_duration.json +146 -0
  35. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/datetime.json +4 -8
  36. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/department.json +6 -10
  37. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/email.json +4 -8
  38. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/embed_field.json +146 -0
  39. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/image_select.json +146 -0
  40. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/link.json +4 -8
  41. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/location.json +146 -0
  42. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/long_text.json +4 -8
  43. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/member.json +6 -10
  44. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/multi_select.json +4 -8
  45. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/number.json +6 -10
  46. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ocr.json +146 -0
  47. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/phone.json +4 -8
  48. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/q_linker.json +8 -12
  49. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/relation.json +73 -15
  50. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/rich_text.json +146 -0
  51. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_choice.json +4 -8
  52. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_select.json +4 -8
  53. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/subtable.json +90 -29
  54. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/text.json +4 -8
  55. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/formula.json +43 -0
  56. package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/summary.json +27 -19
  57. package/src/qingflow_mcp/builder_facade/schemas/portals/manifest.json +59 -0
  58. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/complete.json +1397 -0
  59. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/carousel.json +193 -0
  60. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/chart.json +643 -0
  61. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/favourite.json +203 -0
  62. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/filter.json +331 -0
  63. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/grid.json +265 -0
  64. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/link.json +131 -0
  65. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/task.json +199 -0
  66. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/text.json +123 -0
  67. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/view.json +196 -0
  68. package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/summary.json +800 -0
  69. package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/complete.json +1 -1
  70. package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/details/display.json +1 -1
  71. package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/summary.json +1 -1
  72. package/src/qingflow_mcp/builder_facade/service.py +1367 -92
  73. package/src/qingflow_mcp/cli/commands/builder.py +120 -5
  74. package/src/qingflow_mcp/cli/formatters.py +11 -0
  75. package/src/qingflow_mcp/cli/main.py +90 -2
  76. package/src/qingflow_mcp/cli/permission_gate.py +59 -0
  77. package/src/qingflow_mcp/cloud_context.py +16 -1
  78. package/src/qingflow_mcp/entity_permissions.py +10 -0
  79. package/src/qingflow_mcp/permission_catalog.json +1210 -0
  80. package/src/qingflow_mcp/public_surface.py +69 -8
  81. package/src/qingflow_mcp/response_trim.py +2 -1
  82. package/src/qingflow_mcp/server.py +12 -6
  83. package/src/qingflow_mcp/server_app_builder.py +43 -10
  84. package/src/qingflow_mcp/server_app_user.py +9 -5
  85. package/src/qingflow_mcp/server_cloud.py +43 -7
  86. package/src/qingflow_mcp/session_store.py +14 -1
  87. package/src/qingflow_mcp/solution/compiler/icon_utils.py +73 -0
  88. package/src/qingflow_mcp/solution/executor.py +5 -2
  89. package/src/qingflow_mcp/tool_catalog.py +388 -0
  90. package/src/qingflow_mcp/tool_catalog_i18n.py +184 -0
  91. package/src/qingflow_mcp/tool_policy.py +191 -0
  92. package/src/qingflow_mcp/tools/ai_builder_tools.py +118 -20
  93. package/src/qingflow_mcp/tools/portal_tools.py +4 -54
  94. package/src/qingflow_mcp/tools/portal_writer.py +59 -0
  95. package/src/qingflow_mcp/tools/solution_tools.py +2 -0
@@ -11,9 +11,15 @@ from .app_form_compat import normalize_app_form_declaration
11
11
  from .builder_facade.app_form_schema import AppFormContractError, compact_schema_errors, schema_error_message
12
12
 
13
13
 
14
+ #: code_block / q_linker 输出目标字段类型。后端写链无类型白名单(FormSvcImpl
15
+ #: 原样落库),运行时 DataSvcImpl.getAnswerValueByString:选项/数字/日期有专门
16
+ #: 分支;attachment 按拆分 URL 写入(专门分支);subtable 整表组装(专门分支);
17
+ #: rich_text/data_relation 走 Question.canImport 兜底按字符串写入(不报错)。
18
+ #: 四者为存量合法配置(提取读得出、apply 必须写回,两闸门同口径)。
14
19
  _INTEGRATION_OUTPUT_TARGET_FIELD_TYPES = {
15
20
  "text",
16
21
  "long_text",
22
+ "rich_text",
17
23
  "number",
18
24
  "amount",
19
25
  "date",
@@ -21,8 +27,17 @@ _INTEGRATION_OUTPUT_TARGET_FIELD_TYPES = {
21
27
  "single_choice",
22
28
  "single_select",
23
29
  "multi_select",
30
+ "attachment",
31
+ # r10 存量实证放行:link(92nl6blfk402)/member(ab9fjvj33001)——后端写链
32
+ # 无类型白名单,运行时同为字符串写入路径
33
+ "link",
34
+ "member",
35
+ "data_relation",
36
+ "subtable",
24
37
  }
25
- _Q_LINKER_TEMPLATE_RE = re.compile(r"\{\{(?P<key>[^{}\s]+)\}\}")
38
+ # key 允许含空白(r10 实测存量 key 如「应用包 ID」带空格,\s 排除导致占位符
39
+ # 扫描漏检 → validate 误报「key must appear as {{key}}」)
40
+ _Q_LINKER_TEMPLATE_RE = re.compile(r"\{\{(?P<key>[^{}]+)\}\}")
26
41
  _FORMULA_IDENTIFIER_RE = re.compile(r"[A-Za-z_][A-Za-z0-9_]*")
27
42
  #: 公式字段引用正则(#queId_<id>$,支持表格嵌套 <id>.<id>)
28
43
  _FORMULA_FIELD_REF_RE = re.compile(r"#queId_([^$]+)\$")
@@ -218,19 +233,32 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
218
233
  widths = ["width" in field for field in fields if isinstance(field, dict)]
219
234
  if widths and any(widths) and not all(widths):
220
235
  errors.append((row_path, "width must be present on every field in the row or omitted from all"))
221
- if widths and all(widths) and sum(field.get("width", 0) for field in fields if isinstance(field, dict)) != 100:
222
- errors.append((row_path, "field widths must total 100"))
236
+ # 行宽契约(与后端语义对齐):任意 1-100 整数 + 全有或全无。
237
+ # 后端 html_width 无取值/总和校验,存量存在 33/34 三等分与字段删除后
238
+ # 留白(如 3×25=75)的行;get 读出的原布局必须能原样过校验
239
+ # (apply(get(S)) ≡ S 命题的必要条件)。
240
+ if widths and all(widths):
241
+ bad = [f.get("width") for f in fields if isinstance(f, dict) and not (isinstance(f.get("width"), int) and 1 <= f["width"] <= 100)]
242
+ if bad:
243
+ errors.append((row_path, "field widths must be an integer between 1 and 100"))
223
244
  for field_index, field in enumerate(fields):
224
245
  if isinstance(field, dict):
225
246
  top_fields.append((f"{row_path}/{field_index}", field))
226
247
  def resolve_local_selector(selector: Any) -> tuple[str, tuple[str, dict[str, Any]] | None]:
227
- """Resolve against the declared body, preserving backend-dependent ID-only cases."""
248
+ """Resolve against the declared body, preserving backend-dependent ID-only cases.
249
+
250
+ 返回态:resolved(唯一定位)/ invalid(定位失败)/ ambiguous(方案 A:name-only
251
+ 命中多个同名字段,调用方须报 AMBIGUOUS_FIELD_SELECTOR)/ unknown(存在未命名
252
+ 字段,后端侧再判)/ schema(结构不完整,交给 Schema 校验)。
253
+ """
228
254
  if not isinstance(selector, dict):
229
255
  return "schema", None
230
256
  raw_que_id = selector.get("queId")
231
257
  que_id = raw_que_id if isinstance(raw_que_id, int) and not isinstance(raw_que_id, bool) else None
232
258
  raw_name = selector.get("name")
233
- name = raw_name if isinstance(raw_name, str) and raw_name else ""
259
+ # name 两侧 strip:存量字段名带前导/尾随空格,queId 已同时给出不构成歧义
260
+ # (与 compiler 侧三个 resolve 函数同口径)。
261
+ name = raw_name.strip() if isinstance(raw_name, str) and raw_name.strip() else ""
234
262
  if raw_que_id is not None and que_id is None:
235
263
  return "schema", None
236
264
  if raw_name is not None and not name:
@@ -239,26 +267,52 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
239
267
  matches = [(path, field) for path, field in top_fields if field.get("queId") == que_id]
240
268
  if len(matches) != 1:
241
269
  return "invalid", None
242
- declared_name = str(matches[0][1].get("name") or "")
270
+ declared_name = str(matches[0][1].get("name") or "").strip()
243
271
  if name and declared_name and name != declared_name:
244
272
  return "invalid", None
245
273
  return "resolved", matches[0]
246
274
  if name:
247
- matches = [(path, field) for path, field in top_fields if str(field.get("name") or "") == name]
275
+ matches = [(path, field) for path, field in top_fields if str(field.get("name") or "").strip() == name]
248
276
  if len(matches) == 1:
249
277
  return "resolved", matches[0]
250
278
  if len(matches) > 1:
251
- return "invalid", None
279
+ return "ambiguous", None
252
280
  if any(not str(field.get("name") or "") for _, field in top_fields):
253
281
  return "unknown", None
254
282
  return "invalid", None
255
283
  return "schema", None
256
284
 
285
+ def ambiguity_message(selector: Any, subject: str) -> str:
286
+ name = str((selector or {}).get("name") or "").strip()
287
+ candidate_ids = sorted(
288
+ {
289
+ field.get("queId")
290
+ for _, field in top_fields
291
+ if str(field.get("name") or "").strip() == name
292
+ and isinstance(field.get("queId"), int)
293
+ and not isinstance(field.get("queId"), bool)
294
+ }
295
+ )
296
+ return (
297
+ f"AMBIGUOUS_FIELD_SELECTOR: {subject} name {name!r} matches multiple fields "
298
+ f"(candidate queIds: {candidate_ids}); duplicate names are allowed but "
299
+ "selectors must use queId to disambiguate"
300
+ )
301
+
257
302
  title_selector = spec.get("dataTitleField")
258
303
  if top_fields:
259
304
  if "dataTitleField" not in spec and "appKey" in payload:
260
305
  pass
261
- elif title_selector is None or resolve_local_selector(title_selector)[0] == "invalid":
306
+ elif title_selector is None:
307
+ # dataTitleField=null 仅在带 appKey 的更新/round-trip 场景放行:后端写链
308
+ # FormSvcImpl.normalizeDataTitleQueId 对 null 自动 fallback 到第一个可用
309
+ # 字段,get 读面在后端未设置时原样输出 null。创建场景(无 appKey)仍需
310
+ # 显式 selector。
311
+ if "appKey" not in payload:
312
+ errors.append(("/spec/dataTitleField", "dataTitleField must resolve to exactly one top-level field"))
313
+ elif resolve_local_selector(title_selector)[0] == "ambiguous":
314
+ errors.append(("/spec/dataTitleField", ambiguity_message(title_selector, "dataTitleField")))
315
+ elif resolve_local_selector(title_selector)[0] == "invalid":
262
316
  errors.append(("/spec/dataTitleField", "dataTitleField must resolve to exactly one top-level field"))
263
317
  elif title_selector is not None:
264
318
  errors.append(("/spec/dataTitleField", "dataTitleField must be null when body is empty"))
@@ -266,11 +320,15 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
266
320
  cover_selector = spec.get("dataCoverField")
267
321
  if cover_selector is not None:
268
322
  cover_resolution, cover = resolve_local_selector(cover_selector)
269
- if cover_resolution == "invalid":
323
+ if cover_resolution == "ambiguous":
324
+ errors.append(("/spec/dataCoverField", ambiguity_message(cover_selector, "dataCoverField")))
325
+ elif cover_resolution == "invalid":
270
326
  errors.append(("/spec/dataCoverField", "dataCoverField must resolve to exactly one top-level field"))
271
327
  elif cover_resolution == "resolved" and cover is not None and _field_type(cover[1]) != "attachment":
272
328
  errors.append(("/spec/dataCoverField", "dataCoverField must select a top-level attachment field"))
273
- names: dict[str, str] = {}
329
+ # 方案 A(duplicate-field-name):同父级允许同名(后端以 queId 为身份,40013
330
+ # 实测 1624 组),不再报 duplicate name;歧义在 selector 解析处以
331
+ # AMBIGUOUS_FIELD_SELECTOR 显式拒绝。
274
332
  fields_by_id = {
275
333
  field.get("queId"): field
276
334
  for _, field in top_fields
@@ -278,12 +336,6 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
278
336
  }
279
337
  output_targets: dict[str, tuple[str, str]] = {}
280
338
  for path, field in top_fields:
281
- name = str(field.get("name") or "")
282
- if name:
283
- if name in names:
284
- errors.append((f"{path}/name", f"duplicate top-level field name; first declared at {names[name]}"))
285
- else:
286
- names[name] = f"{path}/name"
287
339
  field_type = _field_type(field)
288
340
  if field_type == "data_relation":
289
341
  config = field.get("config") if isinstance(field.get("config"), dict) else {}
@@ -307,7 +359,15 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
307
359
  "is_empty and is_not_empty require a literal operand with values: []",
308
360
  )
309
361
  )
310
- elif operand.get("kind") == "literal" and not values:
362
+ elif (
363
+ operand.get("kind") == "literal"
364
+ and not values
365
+ and operator not in {"subordinate_to", "not_subordinate_to"}
366
+ ):
367
+ # subordinate 两算子放行空 literal:存量「设置后清空」形态
368
+ # (r13 实证 41ce0ad8 六处)——后端写链 checkRelationMatchRules
369
+ # 仅校验 dynamic_range(FormSvcImpl:10448),formula 渲染对空
370
+ # judgeValueDetails 输出 [](Formula:397),读回解析对称,往返保真
311
371
  errors.append(
312
372
  (
313
373
  f"{operand_path}/values",
@@ -329,6 +389,9 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
329
389
  selector = item.get("field") if isinstance(item.get("field"), dict) else {}
330
390
  input_path = f"{path}/config/{binding_name}/inputs/{index}"
331
391
  resolution, selected = resolve_local_selector(selector)
392
+ if resolution == "ambiguous":
393
+ errors.append((f"{input_path}/field", ambiguity_message(selector, f"{binding_name}.inputs[{index}].field")))
394
+ continue
332
395
  if resolution == "invalid":
333
396
  errors.append((f"{input_path}/field", "input field must resolve to exactly one top-level field"))
334
397
  continue
@@ -337,7 +400,10 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
337
400
  selected_name = selected[1].get("name") if selected is not None else selector.get("name")
338
401
  if not selected_name and selector.get("queId") in fields_by_id:
339
402
  selected_name = fields_by_id[selector["queId"]].get("name")
340
- if selected_name and item.get("key") != selected_name:
403
+ # 两侧 strip:模板引用名提取时已 strip(字段名存量带尾随空格,如
404
+ # am4oh08v2401「答:Answer 」),严格相等会把「引用名≠当前字段名」的
405
+ # 存量形态误报为 key 不一致
406
+ if selected_name and str(item.get("key") or "").strip() != str(selected_name).strip():
341
407
  errors.append((f"{input_path}/key", "json_path key must equal the selected field name"))
342
408
 
343
409
  if field_type == "q_linker":
@@ -380,13 +446,16 @@ def _static_errors(payload: dict[str, Any]) -> list[tuple[str, str]]:
380
446
  )
381
447
  )
382
448
 
383
- producer = name or str(field.get("queId") or field_type)
449
+ producer = str(field.get("name") or "") or str(field.get("queId") or field_type)
384
450
  for index, item in enumerate(binding.get("outputs") or []):
385
451
  if not isinstance(item, dict):
386
452
  continue
387
453
  selector = item.get("targetField")
388
454
  target_path = f"{path}/config/{binding_name}/outputs/{index}/targetField"
389
455
  resolution, selected = resolve_local_selector(selector)
456
+ if resolution == "ambiguous":
457
+ errors.append((target_path, ambiguity_message(selector, f"{binding_name}.outputs[{index}].targetField")))
458
+ continue
390
459
  if resolution == "invalid":
391
460
  errors.append((target_path, "targetField must resolve to exactly one top-level field"))
392
461
  continue