cardbuddy 0.15.0 → 0.17.0

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 (107) hide show
  1. package/dist/init.js +0 -2
  2. package/dist/preview-editor/assets/index-CXDf5tVg.css +1 -0
  3. package/dist/preview-editor/assets/{index-CIIfMlwI.js → index-DLQkCPLT.js} +113 -86
  4. package/dist/preview-editor/index.html +2 -2
  5. package/dist/vendored/card-editor/runtime/adapter.js +2 -2
  6. package/dist/vendored/mcp/client.mjs +1 -1
  7. package/dist/vendored/server/core/ai-chat.js +251 -80
  8. package/dist/vendored/server/core/browser.js +17 -0
  9. package/dist/vendored/server/core/cardFiles.js +49 -1
  10. package/dist/vendored/server/core/cardImage.js +103 -2
  11. package/dist/vendored/server/core/cardValidate.js +16 -5
  12. package/dist/vendored/server/core/screenshot.js +94 -0
  13. package/dist/vendored/skills/card-skill-trainer/SKILL.md +68 -13
  14. package/dist/vendored/skills/card-skill-trainer/scripts/diagnose_case.mjs +14 -82
  15. package/dist/vendored/skills/card-skill-trainer/scripts/lib/diagnosis.mjs +207 -0
  16. package/dist/vendored/skills/card-skill-trainer/scripts/lib/layout-correction-sim.mjs +62 -0
  17. package/dist/vendored/skills/card-skill-trainer/scripts/lib/paradigm-router.mjs +76 -0
  18. package/dist/vendored/skills/card-skill-trainer/scripts/lib/pixel-worker-runner.mjs +31 -0
  19. package/dist/vendored/skills/card-skill-trainer/scripts/lib/pixel-worker.mjs +138 -0
  20. package/dist/vendored/skills/card-skill-trainer/scripts/lib/scoring.mjs +24 -20
  21. package/dist/vendored/skills/card-skill-trainer/scripts/lib/telemetry.mjs +46 -0
  22. package/dist/vendored/skills/card-skill-trainer/scripts/plan_next_round.mjs +5 -2
  23. package/dist/vendored/skills/card-skill-trainer/scripts/run_round.mjs +286 -92
  24. package/dist/vendored/skills/card-skill-trainer/scripts/score_round.mjs +74 -2
  25. package/dist/vendored/skills/card-skill-trainer/scripts/sink_rules.mjs +127 -0
  26. package/dist/vendored/skills/dsl-card-generator/SKILL.md +93 -27
  27. package/dist/vendored/skills/dsl-card-generator/references/component_rules.md +14 -0
  28. package/dist/vendored/skills/dsl-card-generator/references/dsl_structure.md +1 -15
  29. package/dist/vendored/skills/dsl-card-generator/references/expression_engine.md +11 -20
  30. package/dist/vendored/skills/dsl-card-generator/references/generation_pitfalls.md +217 -44
  31. package/dist/vendored/skills/dsl-card-generator/references/ir-format.md +87 -3
  32. package/dist/vendored/skills/dsl-card-generator/references/iteration_protocol.md +35 -6
  33. package/dist/vendored/skills/dsl-card-generator/references/previewer_contract.md +21 -0
  34. package/dist/vendored/skills/dsl-card-generator/references/quickref.md +28 -27
  35. package/dist/vendored/skills/dsl-card-generator/references/recipes.md +30 -8
  36. package/dist/vendored/skills/dsl-card-generator/references/rules.md +3 -2
  37. package/dist/vendored/skills/dsl-card-generator/references/scripts_reference.md +5 -2
  38. package/dist/vendored/skills/dsl-card-generator/references/slices_convention.md +2 -3
  39. package/dist/vendored/skills/dsl-card-generator/references/spec_to_schema_patterns.md +1 -4
  40. package/dist/vendored/skills/dsl-card-generator/scripts/add_component.mjs +5 -14
  41. package/dist/vendored/skills/dsl-card-generator/scripts/autofix_schema.py +88 -0
  42. package/dist/vendored/skills/dsl-card-generator/scripts/check_fidelity.mjs +143 -42
  43. package/dist/vendored/skills/dsl-card-generator/scripts/check_topology.py +0 -35
  44. package/dist/vendored/skills/dsl-card-generator/scripts/expand_ir.mjs +99 -53
  45. package/dist/vendored/skills/dsl-card-generator/scripts/gate.mjs +5 -2
  46. package/dist/vendored/skills/dsl-card-generator/scripts/iterate.mjs +388 -29
  47. package/dist/vendored/skills/dsl-card-generator/scripts/lib/component_contract.mjs +315 -0
  48. package/dist/vendored/skills/dsl-card-generator/scripts/lib/layout-tokens.mjs +1 -1
  49. package/dist/vendored/skills/dsl-card-generator/scripts/lib/paths.mjs +23 -0
  50. package/dist/vendored/skills/dsl-card-generator/scripts/lib/paths.py +0 -37
  51. package/dist/vendored/skills/dsl-card-generator/scripts/lib/python.mjs +99 -0
  52. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/adaptive-width.mjs +105 -0
  53. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/bindings.mjs +260 -0
  54. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/expr.mjs +52 -0
  55. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/image.mjs +96 -0
  56. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/registry.mjs +166 -0
  57. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/structure.mjs +127 -0
  58. package/dist/vendored/skills/dsl-card-generator/scripts/lib/rules/walk.mjs +61 -0
  59. package/dist/vendored/skills/dsl-card-generator/scripts/lib/scaffold.mjs +48 -1
  60. package/dist/vendored/skills/dsl-card-generator/scripts/lib/scope_alias.mjs +125 -0
  61. package/dist/vendored/skills/dsl-card-generator/scripts/lib/v3_assemble.mjs +366 -45
  62. package/dist/vendored/skills/dsl-card-generator/scripts/lib/v3_extract.mjs +169 -12
  63. package/dist/vendored/skills/dsl-card-generator/scripts/lib/v3_shared.mjs +17 -9
  64. package/dist/vendored/skills/dsl-card-generator/scripts/lint_card.mjs +119 -78
  65. package/dist/vendored/skills/dsl-card-generator/scripts/preflight.mjs +48 -50
  66. package/dist/vendored/skills/dsl-card-generator/scripts/readiness.mjs +634 -0
  67. package/dist/vendored/skills/dsl-card-generator/scripts/register_card_template.mjs +5 -8
  68. package/dist/vendored/skills/dsl-card-generator/scripts/route_input.mjs +5 -10
  69. package/dist/vendored/skills/dsl-card-generator/scripts/spec_audit.mjs +122 -8
  70. package/dist/vendored/skills/dsl-card-generator/scripts/v3_regression.mjs +11 -2
  71. package/dist/vendored/skills/dsl-card-generator/scripts/validate_schema.py +23 -15
  72. package/dist/vendored/skills/finmall-card-sync/scripts/api_batch_sync.mjs +46 -2
  73. package/dist/vendored/skills/mbank-design-gen/SKILL.md +76 -0
  74. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-apps.png +0 -0
  75. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-arrow-right-blue.png +0 -0
  76. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-check.png +0 -0
  77. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-settings.png +0 -0
  78. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-sound.png +0 -0
  79. package/dist/vendored/skills/mbank-design-gen/assets/icons/icon-voice-switch.png +0 -0
  80. package/dist/vendored/skills/mbank-design-gen/assets/icons/progress-thumb.png +0 -0
  81. package/dist/vendored/skills/mbank-design-gen/assets/icons/tag-bg.png +0 -0
  82. package/dist/vendored/skills/mbank-design-gen/assets/icons/vs-badge.png +0 -0
  83. package/dist/vendored/skills/mbank-design-gen/assets/ref/ref-chat-options.png +0 -0
  84. package/dist/vendored/skills/mbank-design-gen/assets/ref/ref-home-scene.png +0 -0
  85. package/dist/vendored/skills/mbank-design-gen/assets/ref/ref-product-detail.png +0 -0
  86. package/dist/vendored/skills/mbank-design-gen/assets/ref/ref-rate-table.png +0 -0
  87. package/dist/vendored/skills/mbank-design-gen/assets/robot.png +0 -0
  88. package/dist/vendored/skills/mbank-design-gen/references/component-library.md +127 -0
  89. package/dist/vendored/skills/mbank-design-gen/references/design-spec.md +261 -0
  90. package/dist/vendored/skills/mbank-design-gen/templates/mockup-template.html +138 -0
  91. package/dist/vendored/skills/mbank-design-gen/tools/screenshot.mjs +34 -0
  92. package/dist/vendored/skills/shared/exit-codes.md +79 -0
  93. package/dist/vendored/skills/shared/spec-contract.md +127 -0
  94. package/dist/vendored/skills/sketch-spec-to-card/SKILL.md +27 -10
  95. package/dist/vendored/skills/sketch-spec-to-card/references/spec-schema.md +3 -3
  96. package/dist/vendored/skills/sketch-spec-to-card/scripts/build_prompt.py +0 -8
  97. package/dist/vendored/skills/sketch-spec-to-card/scripts/cluster_states.py +14 -25
  98. package/dist/vendored/skills/sketch-spec-to-card/scripts/parse_meaxure.py +121 -47
  99. package/dist/vendored/skills/sketch-spec-to-card/scripts/png_utils.py +0 -5
  100. package/dist/vendored/skills/sketch-spec-to-card/scripts/test_text_only_artboard.py +98 -16
  101. package/dist/vendored/skills/sketch-spec-to-card/scripts/vision.py +55 -37
  102. package/dist/vendored/templates/helloCard/schema.json +62 -1
  103. package/dist/vendored/tools/finmall-env.mjs +1 -18
  104. package/package.json +1 -1
  105. package/dist/preview-editor/assets/index-DQn0zQBP.css +0 -1
  106. package/dist/vendored/skills/card-skill-trainer/scripts/test_missing_slice.py +0 -122
  107. package/dist/vendored/skills/dsl-card-generator/scripts/analyze_component_usage.mjs +0 -153
@@ -85,17 +85,6 @@ def hex_of(color_obj):
85
85
  return None
86
86
 
87
87
 
88
- def rgba_of(color_obj):
89
- """MeaXure color -> 'rgba(r,g,b,a)'(含透明度)。"""
90
- if not isinstance(color_obj, dict):
91
- return None
92
- css = color_obj.get("css-rgba") or color_obj.get("css-hsla")
93
- if css:
94
- return css
95
- h = hex_of(color_obj)
96
- return h
97
-
98
-
99
88
  def extract_data(index_html: Path) -> dict:
100
89
  html = index_html.read_text(encoding="utf-8", errors="ignore")
101
90
  marker = "let data = "
@@ -303,7 +292,8 @@ def _segment_hint(e, card_w, card_rect=None):
303
292
 
304
293
 
305
294
  def detect_segments(card_els, card_rect):
306
- """按 y 几何聚类视觉段。返回 [{y, height, gap_top, hint, items}](y/height 为卡内相对坐标)。
295
+ """按 y 几何聚类视觉段。返回 [{y, height, hint, items}](y/height 为卡内相对坐标;
296
+ 段间距可由相邻 y/height 推导,不再冗余写 gap_top)。
307
297
  规则:
308
298
  1. 排除卡外装饰(全屏背景/蒙版:元素在卡 y 轴交集 < 元素高 50%);
309
299
  2. decor-bg(装饰背景层)元素**强制独立成段**(背景层是独立容器,其下内容必须切段);
@@ -353,26 +343,18 @@ def detect_segments(card_els, card_rect):
353
343
  for i, s in enumerate(segs):
354
344
  bottom = max((it["rect"]["y"] + (it["rect"]["height"] or 0)) for it in s["items"])
355
345
  top = s["y"]
356
- seg = {
346
+ # gap_top 已删(2026-09-24):纯冗余推导值——首段等于 y,后续段可由相邻 y/height 推出
347
+ out.append({
357
348
  "y": round(top - cy, 2),
358
349
  "height": round(bottom - top, 2),
359
350
  "hint": s["hint"],
360
351
  "items": len(s["items"]),
361
- }
362
- if i == 0:
363
- seg["gap_top"] = round(top - cy, 2)
364
- else:
365
- # 修正坐标混用 bug:统一用卡内相对坐标计算 gap_top
366
- prev_bottom_rel = out[i - 1]["y"] + out[i - 1]["height"]
367
- seg["gap_top"] = round(seg["y"] - prev_bottom_rel, 2)
368
- out.append(seg)
352
+ })
369
353
  # 后处理:消除段重叠(前一段底部超出后一段顶部时,截断前一段高度)
370
354
  for i in range(1, len(out)):
371
355
  overlap = (out[i - 1]["y"] + out[i - 1]["height"]) - out[i]["y"]
372
356
  if overlap > 0:
373
357
  out[i - 1]["height"] = round(out[i - 1]["height"] - overlap, 2)
374
- # 重算 gap_top(截断后应 ≥ 0)
375
- out[i]["gap_top"] = round(out[i]["y"] - (out[i - 1]["y"] + out[i - 1]["height"]), 2)
376
358
  return out
377
359
 
378
360
 
@@ -526,6 +508,11 @@ def detect_artboard_cards(ab_raw):
526
508
 
527
509
  这是**唯一**的卡片检出入口:focus_artboard(真跑,随后按卡片裁图)与门禁清单的
528
510
  board_verdict(只想知道「这个画板有没有卡可建」)都走它,两处判定不会漂移。
511
+
512
+ 底部抽屉(bottom_sheet ⇒ artboardType=subcard)走**几何直取**而非候选检测:
513
+ 抽屉面板矩形由 `vision._bottom_sheet_rect` 精确给出,落成 1 张卡。所以
514
+ `focusSkipReason=bottom_sheet_geometry` 与 `cards` 非空**同时成立** —— 该字段的
515
+ 语义是「跳过了自动候选检测」,不是「0 卡」。
529
516
  """
530
517
  W, H = ab_raw.get("width", 0), ab_raw.get("height", 0)
531
518
  raw_layers = ab_raw.get("layers") or []
@@ -538,6 +525,23 @@ def detect_artboard_cards(ab_raw):
538
525
  focus_skip_reason = (
539
526
  "overlay_dialog_geometry" if overlay else "bottom_sheet_geometry"
540
527
  )
528
+ # 底部抽屉(alertCard 子卡)产 1 张卡:面板几何 `vision._bottom_sheet_rect`
529
+ # 早已算出精确 rect + 顶圆角,此前却只写 focusSkipReason 不产 cards —— 结果是
530
+ # cluster_states 承认它是独立逻辑卡(pageId=card-N、isDialog=true),而 spec 层
531
+ # 给不出任何卡级数据,下游只能读整图自己猜边界。
532
+ # ⚠️ focusSkipReason 必须保持 bottom_sheet_geometry:`classify_artboard`(:1667)
533
+ # 靠它判 artboardType=subcard,改它会连带打翻 `is_text_only_artboard`(:1643)、
534
+ # `board_verdict` 与 trainer 的 `is_popup_case`(build_dataset.py:188)。
535
+ if bottom_sheet and not overlay:
536
+ sx, sy, sw, sh, s_radii = bottom_sheet
537
+ # min_cover=0.7:抽屉上沿会切过相邻元素(气泡、气泡内文字层的大头刚过沿
538
+ # 就会被默认口径收进来),用覆盖率门槛滤掉;跨沿的抽屉标题(覆盖≈98%)保留。
539
+ sheet_els = vision.elements_in_rect(flattened, (sx, sy, sw, sh), min_cover=0.7)
540
+ cards.append((
541
+ sx, sy, sw, sh, sheet_els,
542
+ [((sx, sy, sw, sh), list(s_radii or []))],
543
+ vision.card_focus_metrics(sheet_els, (sx, sy, sw, sh), W, H),
544
+ ))
541
545
  else:
542
546
  for x, y, w, h, els, shapes in vision.detect_cards(raw_layers, W, H, conversation_flow):
543
547
  eligible, reason, focus_metrics = vision.classify_card_focus(
@@ -551,6 +555,36 @@ def detect_artboard_cards(ab_raw):
551
555
  "reason": reason,
552
556
  "metrics": focus_metrics,
553
557
  })
558
+
559
+ # 整卡单切图兜底(whole-card-as-one-slice):常规候选全被拒(0 卡)时,若板上存在
560
+ # 卡片级大盘切图(卡片被设计稿整体导成一张图——图层树只剩「编组 N」大图),
561
+ # 把该切图提升为 1 张卡。此前这类板 cards 恒为空 → manifest trainingEligible=false
562
+ # → 数据集构建整板跳过,「对话 + 内嵌卡」形态永远进不了训练;而
563
+ # is_text_only_artboard 早已承认这种板「有卡」(has_card_like_visual),两处口径不一致。
564
+ # 判据(纯几何,与 has_card_like_visual 同口径,禁业务词):
565
+ # · 宽 ≥ 55%W、高 ≥ 12%H,纵向落在 10%..95%H(标题栏之下、输入坞/Home 之上);
566
+ # · 「纯单切图」:区域归属元素只有这张大图本身(无文本/其他切图被归属进来)——
567
+ # 标注里只要还有可建结构,就维持低结构门的保守性,不走图像卡路线;
568
+ # · 仅在 0 卡时触发,已有卡的画板行为不变(冻结锚点安全)。
569
+ if not cards:
570
+ for ve in flattened:
571
+ if not ve.is_slice:
572
+ continue
573
+ sx, sy, sw, sh = ve.rect
574
+ if sw < 0.55 * W or sh < 0.12 * H:
575
+ continue
576
+ if sy < 0.10 * H or (sy + sh) > 0.95 * H:
577
+ continue
578
+ region = (sx, sy, sw, sh)
579
+ owned = vision.elements_in_rect(flattened, region)
580
+ if len(owned) != 1 or owned[0] is not ve:
581
+ continue # 区域里混有任何其他标注 → 不兜底,交给既有裁决
582
+ cards.append((
583
+ sx, sy, sw, sh, owned,
584
+ [(region, list(ve.radius or []))],
585
+ vision.card_focus_metrics(owned, region, W, H),
586
+ ))
587
+ break # 兜底只提 1 张:多重叠大切图不做连环提升
554
588
  return {
555
589
  "W": W, "H": H, "layers": raw_layers,
556
590
  "overlay": bool(overlay), "sheet": bool(bottom_sheet),
@@ -560,10 +594,14 @@ def detect_artboard_cards(ab_raw):
560
594
  }
561
595
 
562
596
 
563
- def focus_artboard(ab_raw, preview_path, cdir):
597
+ def focus_artboard(ab_raw, preview_path, cdir, canvas_name=None):
564
598
  """对一个画板:检测独立卡片区域 → 结构过滤 → 逐一裁切 → 序列化标注。
565
599
 
566
600
  返回 spec dict(含卡片区域、聚焦截图、样式汇总)。
601
+
602
+ `canvas_name`:写进 `spec["canvas"]` 的画板标识。调用方传**唯一化后**的名字
603
+ (同名画板已追加 -2/-3);缺省回落 Sketch 原始名。下游 `spec_tree.mjs:140`
604
+ 用 `spec.canvas || 目录名` 当展示名,两板同名时不传就会在清单里撞成两行一模一样的字。
567
605
  """
568
606
  found = detect_artboard_cards(ab_raw)
569
607
  W, H = found["W"], found["H"]
@@ -671,8 +709,7 @@ def focus_artboard(ab_raw, preview_path, cdir):
671
709
  focus_skip_reason = "conversation_flow_geometry"
672
710
 
673
711
  spec = {
674
- "canvas": ab_raw.get("name", ""),
675
- "schemaVersion": "1.0",
712
+ "canvas": canvas_name or ab_raw.get("name", ""),
676
713
  "size": {"width": W, "height": H},
677
714
  "cards": card_regions,
678
715
  "rejectedCards": rejected_regions,
@@ -1152,17 +1189,6 @@ def _foreground_mean_color(image_path, rect=None, scale=1.0):
1152
1189
  return (red / count, green / count, blue / count), count
1153
1190
 
1154
1191
 
1155
- def foreground_color_distance(asset_path, preview_path, rect, scale):
1156
- """资产与设计裁切的前景均值色距离;任一侧无前景时返回 None。"""
1157
- asset_mean, asset_count = _foreground_mean_color(asset_path)
1158
- design_mean, design_count = _foreground_mean_color(preview_path, rect, scale)
1159
- if not asset_mean or not design_mean:
1160
- return None
1161
- return math.sqrt(sum(
1162
- (left - right) ** 2 for left, right in zip(asset_mean, design_mean)
1163
- ))
1164
-
1165
-
1166
1192
  def foreground_chroma_distance(asset_path, preview_path, rect, scale):
1167
1193
  """前景均值色的色度距离(r-g / b-g 两分量)。
1168
1194
 
@@ -1540,6 +1566,26 @@ def parse_pick(spec, total):
1540
1566
  return idxs, cards
1541
1567
 
1542
1568
 
1569
+ def unique_canvas_names(names):
1570
+ """同名画板消歧:Sketch 允许两个画板**完全同名**(实测「地址管理」稿 25 板里有两个
1571
+ 「11…_失败_再次修改」,一个 375×1232/129 层、一个 375×1252/130 层,是两个不同设计)。
1572
+
1573
+ 目录名直接用 name 时,后跑的那个会覆盖先跑的(整板产物——artboard.png / card-N.png /
1574
+ spec.json / slices/ ——静默丢失,且 manifest 里两条 entry 指向同一目录);下游也是按
1575
+ name 拼路径定位(`generate_cards.mjs`:`uiDir/<name>/spec.json`),两行同名时用户
1576
+ 在选板清单里同样无法区分。
1577
+
1578
+ 故第 2 个及以后的同名画板追加 `-2` / `-3` 后缀,**name 与 slug 同步唯一化**——
1579
+ 下游零改动即正确(它们只认 name)。
1580
+ """
1581
+ seen = {}
1582
+ out = []
1583
+ for nm in names:
1584
+ seen[nm] = seen.get(nm, 0) + 1
1585
+ out.append(nm if seen[nm] == 1 else f"{nm}-{seen[nm]}")
1586
+ return out
1587
+
1588
+
1543
1589
  def select_canvases(all_names, args):
1544
1590
  n = len(all_names)
1545
1591
  if args.list:
@@ -2035,10 +2081,13 @@ def main():
2035
2081
  print(f"[INFO] 解析到 {total} 个画布(来源:{src.name})")
2036
2082
 
2037
2083
  names = [ab.get("name", f"artboard-{i}") for i, ab in enumerate(artboards)]
2084
+ # 同名画板唯一化:name 同时是目录名、manifest 标识与下游定位键,必须唯一(详见
2085
+ # unique_canvas_names)。清单展示也用唯一名——用户看到的行与落盘目录、下游定位键三者一致。
2086
+ dir_names = unique_canvas_names(names)
2038
2087
  if args.list:
2039
2088
  # 展示统一 1 起(与多画板门禁清单同口径);--indices 仍为 0 起,用户序号 k → k-1
2040
2089
  # 每个画板行下面紧跟它自己那张预览图(一一对应;缺图显式标缺失),禁止把图堆在末尾
2041
- print_board_pool(names, artboards, src, base, " 全部. 全部")
2090
+ print_board_pool(dir_names, artboards, src, base, " 全部. 全部")
2042
2091
  return
2043
2092
 
2044
2093
  # ── 多画板选择门禁(rules.md §十三 / SKILL.md §2 步骤 2,2026-09-17 机械兜底)──
@@ -2052,7 +2101,7 @@ def main():
2052
2101
  print("[GATE] 按铁律必须先把下面的清单(1..n + 全部)交给用户并**停止输出等回复**,"
2053
2102
  "不得自行跑全量(「生成产物 / 前处理」请求同样适用):")
2054
2103
  print("[GATE] 清单已按体检结果分段:纯文本画板(对话/问答/提示)无卡可建,已过滤出选项池。")
2055
- print_board_pool(names, artboards, src, base,
2104
+ print_board_pool(dir_names, artboards, src, base,
2056
2105
  " 全部. 全部(整份导出全量跑 UI 产物;产卡时视为显式批量授权"
2057
2106
  "——纯文本画板只出参考图,不出卡)")
2058
2107
  print("[GATE] 拿到回复后重跑:**直接照抄清单行尾的 --pick**(板号 1 起、卡号 1 起,"
@@ -2061,17 +2110,17 @@ def main():
2061
2110
  "无人值守批量训练可直接 --scope-all 或 SKETCH_SPEC_SCOPE_ALL=1。")
2062
2111
  sys.exit(4)
2063
2112
 
2064
- sel = select_canvases(names, args)
2113
+ sel = select_canvases(dir_names, args)
2065
2114
  if not sel:
2066
2115
  print("[WARN] 没有匹配到任何画布。", file=sys.stderr)
2067
2116
  sys.exit(0)
2068
2117
  # 显式点名纯文本画板时不拦(用户可能只想拿参考图),但必须说清楚不会出卡
2069
2118
  for i in sel:
2070
- v = board_verdict(names[i], artboards[i] if i < len(artboards) else None)
2119
+ v = board_verdict(dir_names[i], artboards[i] if i < len(artboards) else None)
2071
2120
  if v["skip"]:
2072
- print(f"[WARN] {names[i]}:纯文本画板(对话/问答/提示),无卡可建——"
2121
+ print(f"[WARN] {dir_names[i]}:纯文本画板(对话/问答/提示),无卡可建——"
2073
2122
  f"本次只会产出整图参考与判定依据,不会出卡。", file=sys.stderr)
2074
- print(f"[INFO] 本次生成 {len(sel)} 个画布:{', '.join(names[i] for i in sel)}")
2123
+ print(f"[INFO] 本次生成 {len(sel)} 个画布:{', '.join(dir_names[i] for i in sel)}")
2075
2124
  if args.pick:
2076
2125
  _, picked_cards = parse_pick(args.pick, total)
2077
2126
  if picked_cards:
@@ -2110,7 +2159,8 @@ def main():
2110
2159
  previous_entries = {}
2111
2160
 
2112
2161
  for i, ab in enumerate(artboards):
2113
- name = names[i]
2162
+ name = dir_names[i] # 目录名 / manifest 标识 / 下游定位键(同名已唯一化)
2163
+ orig_name = names[i] # Sketch 原始名:只用于分类兜底与预览图兜底探测
2114
2164
  status = "generated" if i in sel else "pending"
2115
2165
  entry = {
2116
2166
  "order": i + 1,
@@ -2119,6 +2169,9 @@ def main():
2119
2169
  "status": status,
2120
2170
  "trainingEligible": False,
2121
2171
  }
2172
+ if name != orig_name:
2173
+ # 同名画板被消歧(name 追加了 -2/-3):留下原始名便于人回溯这板在 Sketch 里叫什么
2174
+ entry["nameOriginal"] = orig_name
2122
2175
  if i not in sel and name in previous_entries:
2123
2176
  for inherited in ("status", "trainingEligible", "artboardType", "preview"):
2124
2177
  if inherited in previous_entries[name]:
@@ -2134,7 +2187,11 @@ def main():
2134
2187
  preview_rel = unquote(ab.get("imagePath", "") or "")
2135
2188
  src_png = (src / preview_rel) if preview_rel else None
2136
2189
  if not (src_png and src_png.is_file()):
2137
- cand = [c for c in src.glob(f"preview/*{name.split('_', 1)[-1]}*.png") if c.is_file()]
2190
+ # 注意:只对 orig_name 兜底——唯一化后缀(-2)在导出目录里不存在,
2191
+ # 拿 name 去 glob 必然空手。
2192
+ # 已知局限:同名画板且 imagePath 也缺失时,两板 tail 相同、glob 命中多张
2193
+ # 且顺序不定,可能取到同一张图。这是「双缺失」场景,属兜底兜不住,不在此展开。
2194
+ cand = [c for c in src.glob(f"preview/*{orig_name.split('_', 1)[-1]}*.png") if c.is_file()]
2138
2195
  src_png = cand[0] if cand else None
2139
2196
  if src_png:
2140
2197
  shutil.copy2(src_png, cdir / "artboard.png")
@@ -2154,10 +2211,12 @@ def main():
2154
2211
  print(f" [WARN] {name}: 找不到整图 {preview_rel}", file=sys.stderr)
2155
2212
 
2156
2213
  # 视觉聚焦:卡片区域检测 + 裁切
2157
- spec = focus_artboard(ab, src_png, cdir)
2214
+ # 传唯一名:spec.canvas 是下游展示名(spec_tree.mjs:140)与 prompt.md 标题
2215
+ spec = focus_artboard(ab, src_png, cdir, canvas_name=name)
2158
2216
 
2159
2217
  # 交互分类(视觉信号优先,名称兜底 — 详见 classify_artboard)
2160
- at, interaction = classify_artboard(name, spec, ab.get("layers") or [], ab.get("height", 812))
2218
+ # 传 orig_name:名称模式是子串匹配,唯一化后缀(-2)不该参与语义判定
2219
+ at, interaction = classify_artboard(orig_name, spec, ab.get("layers") or [], ab.get("height", 812))
2161
2220
  spec["artboardType"] = at
2162
2221
  spec["interaction"] = interaction
2163
2222
  # JSAPI 交互控件检测(密码/验证码/数字键盘/toast/二次确认)
@@ -2181,6 +2240,21 @@ def main():
2181
2240
  )
2182
2241
  spec["slices"] = slices_rel
2183
2242
 
2243
+ # 切图索引(C5):slices/ 是嵌套目录(如 8.icon/通用/警示-#999@3x.png),没有索引时
2244
+ # 模型只能 fs_list 逐层摸索真名(gen-1 实测 6 次 fs_list + 2 次 fs_copy 手工搬运)。
2245
+ # 有了索引,第一次写 IR 就能对上真名(引用名按 R31 消毒,expand_ir 递归命中)。
2246
+ try:
2247
+ _slice_root = cdir / "slices"
2248
+ _slice_idx = [
2249
+ {"file": str(p.relative_to(_slice_root)).replace(os.sep, "/"), "bytes": p.stat().st_size}
2250
+ for p in sorted(_slice_root.rglob("*"))
2251
+ if p.is_file() and p.name != "index.json" and p.suffix.lower() in {".png", ".jpg", ".jpeg", ".webp", ".svg"}
2252
+ ]
2253
+ (_slice_root / "index.json").write_text(
2254
+ json.dumps(_slice_idx, ensure_ascii=False, indent=2), encoding="utf-8")
2255
+ except Exception as e: # noqa
2256
+ print(f" [WARN] slices/index.json 写入失败(不阻塞要素包):{e}", file=sys.stderr)
2257
+
2184
2258
  # 画板是否无卡(0 卡 → 标记跳过,保留整图供参考)
2185
2259
  # 仅当既无独立卡片、又元素极少(<3)才视为真正空画板;
2186
2260
  # 元素丰富但无卡的情况可能是底部弹窗/全屏覆盖层,保留 status 供下游决策。
@@ -302,11 +302,6 @@ def crop_png_masked(path, box, out_path, scale=1.0, shapes=None):
302
302
  write_png(out_path, cw, ch, 4, out_rows)
303
303
 
304
304
 
305
- def _paeth(a, b, c):
306
- pa, pb, pc = abs(b - c), abs(a - c), abs(a + b - 2 * c)
307
- return a if (pa <= pb and pa <= pc) else (b if pb <= pc else c)
308
-
309
-
310
305
  def write_png(path, width, height, channels, rows):
311
306
  """写 8-bit 非交织 PNG(filter 全 0,简单可靠)。"""
312
307
  stride = width * channels
@@ -6,10 +6,16 @@
6
6
 
7
7
  1. 纯文本对话页(信用卡返现 01/03 型):气泡里只有文字 → text_only,被过滤;
8
8
  2. 对话 + 内嵌矢量卡(理财 06 型):卡壳里是 3 宫格选项,检测器会读成「控件条」→ 保留;
9
- 3. 对话 + 卡片切图(房贷 32 型):卡片被整体导成一张切图 → 保留;
10
- 4. 底部抽屉(个人购汇 08 型):alertCard 子卡形态 → 保留(subcard);
9
+ 3. 对话 + 卡片切图(房贷 32 型):卡片被整体导成一张切图 → 整卡单切图兜底产 1 张卡
10
+ (2026-09-28 前 cards 恒为 0,训练集永远盖不到该形态);
11
+ 4. 底部抽屉(喜豆 04/05/06 型):alertCard 子卡形态 → 保留(subcard),
12
+ 且**产 1 张卡**(矩形由 `vision._bottom_sheet_rect` 几何直取,非候选检测);
11
13
  5. 全屏遮罩弹框 → 保留(overlay_dialog);
12
14
  6. 0 候选的普通文字页:保守保留,交给下游裁决(维持既有行为)。
15
+
16
+ 断言分两层:`kind/skip`(画板类型判定,6 例)+ `cards` 数(产出,注意卡片型用例
17
+ 允许 0 —— kind 与 cards 数解耦是上游有意设计;整卡单切图兜底后用例 3 产 1 张)
18
+ + 抽屉元素归属(边界气泡不得渗入)。
13
19
  """
14
20
  import sys
15
21
  from pathlib import Path
@@ -96,10 +102,19 @@ CHAT_WITH_SLICED_CARD = ab("32房贷利率调整_有房贷_可以调整", chrome
96
102
  ])
97
103
 
98
104
  # ── 4. 底部抽屉(alertCard 子卡)──
99
- BOTTOM_SHEET = ab("08个人购汇_有人民币子账户_个人购汇申请书", chrome() + [
100
- L("底部面板", "shape", 0, 600, 375, 212, radius=[16, 16, 0, 0], hexv="#FFFFFFFF"),
101
- text("个人购汇申请书", 20, 620, 200, 24),
102
- text("本人已知晓……", 20, 660, 320, 60),
105
+ # 形态照真实稿(喜豆 04/05/06 型):抽屉贴底通栏、顶圆角底直角,覆盖下半屏;
106
+ # 被盖住的区域**不再有**底部导航/输入坞图层(不是 chrome 叠加)。抽屉上沿 500
107
+ # 紧邻上一条气泡(其中心 503 恰好越过上沿)—— 用来验证元素归属的覆盖率门槛。
108
+ BOTTOM_SHEET = ab("08个人购汇_有人民币子账户_个人购汇申请书", [
109
+ L("98.全局/系统控件/状态栏", "symbol", 0, 0, 375, 44),
110
+ L("5.导航/标题栏/黑-标题+三icon", "symbol", 0, 0, 375, 88),
111
+ ] + bubble(238, 482, 118, 42, text("修改家庭地址", 252, 492, 90, 22)) + [
112
+ L("5.反馈/弹窗/底部弹窗/选择付款卡", "group", 0, 499, 375, 313, layers=[
113
+ L("矩形", "shape", 0, 500, 375, 312, radius=[20, 20, 0, 0], hexv="#FFFFFFFF"),
114
+ text("请选择所在地区", 128, 517, 119, 24),
115
+ text("确定", 325, 517, 30, 24),
116
+ text("取消", 20, 517, 30, 24),
117
+ ]),
103
118
  ])
104
119
 
105
120
  # ── 5. 全屏遮罩弹框(alertDialog)──
@@ -116,29 +131,66 @@ PLAIN_NO_CANDIDATE = ab("03信用卡返现_有信用卡_无返现记录", chrome
116
131
  ])
117
132
 
118
133
  CASES = [
119
- (CHAT_TEXT_ONLY, "text_only", True, "纯文本对话页(只有问答气泡)"),
120
- (CHAT_WITH_VECTOR_CARD, "card", False, "对话 + 内嵌矢量卡(3 宫格选项)"),
121
- (CHAT_WITH_SLICED_CARD, "card", False, "对话 + 卡片切图"),
122
- (BOTTOM_SHEET, "subcard", False, "底部抽屉(alertCard 子卡)"),
123
- (OVERLAY_DIALOG, "overlay_dialog", False, "全屏遮罩弹框(alertDialog)"),
124
- (PLAIN_NO_CANDIDATE, "card", False, "0 候选的普通文字页(保守保留)"),
134
+ (CHAT_TEXT_ONLY, "text_only", True, 0, "纯文本对话页(只有问答气泡)"),
135
+ (CHAT_WITH_VECTOR_CARD, "card", False, 0, "对话 + 内嵌矢量卡(3 宫格选项)"),
136
+ (CHAT_WITH_SLICED_CARD, "card", False, 1, "对话 + 卡片切图(整卡单切图兜底)"),
137
+ (BOTTOM_SHEET, "subcard", False, 1, "底部抽屉(alertCard 子卡)→ 几何直取 1 张卡"),
138
+ (OVERLAY_DIALOG, "overlay_dialog", False, 0, "全屏遮罩弹框(alertDialog)"),
139
+ (PLAIN_NO_CANDIDATE, "card", False, 0, "0 候选的普通文字页(保守保留)"),
125
140
  ]
126
141
 
127
142
 
128
143
  def main():
129
144
  failed = 0
130
- for board, kind, skip, why in CASES:
145
+ for board, kind, skip, exp_cards, why in CASES:
131
146
  found = pm.detect_artboard_cards(board)
132
147
  verdict = pm.board_verdict(board["name"], board)
133
- ok = verdict["kind"] == kind and verdict["skip"] == skip
148
+ got_cards = len(found["cards"])
149
+ ok = (verdict["kind"] == kind and verdict["skip"] == skip
150
+ and got_cards == exp_cards)
134
151
  reasons = sorted({r["reason"] for r in found["rejected"]})
135
152
  mark = "PASS" if ok else "FAIL"
136
153
  if not ok:
137
154
  failed += 1
138
155
  print(f"[{mark}] {why}: kind={verdict['kind']}(期望 {kind}) "
139
- f"skip={verdict['skip']}(期望 {skip}) cards={len(found['cards'])} "
156
+ f"skip={verdict['skip']}(期望 {skip}) "
157
+ f"cards={got_cards}(期望 {exp_cards}) "
140
158
  f"conv={bool(found['conversationFlow'])} rejected={reasons}")
141
159
 
160
+ # 抽屉卡的元素归属(真实稿 04/05/06 形态):上沿外的气泡不得渗入,跨沿标题必须保留
161
+ found = pm.detect_artboard_cards(BOTTOM_SHEET)
162
+ assert found["cards"], "底部抽屉应产 1 张卡"
163
+ sx, sy, sw, sh, dock_els, dock_shapes, _m = found["cards"][0]
164
+ assert (sx, sy, sw, sh) == (0, 500, 375, 312), f"抽屉卡矩形应取面板几何,实际 {(sx, sy, sw, sh)}"
165
+ assert dock_shapes == [((0, 500, 375, 312), [20, 20, 0, 0])], f"外壳几何(含顶圆角)应原样带入,实际 {dock_shapes}"
166
+ dock_names = {e.name for e in dock_els}
167
+ assert "修改家庭地址" not in dock_names, "抽屉上沿外的气泡渗入了(覆盖率门槛 0.6 失效)"
168
+ assert {"请选择所在地区", "确定", "取消"} <= dock_names, f"跨沿的抽屉标题必须保留,实际 {sorted(dock_names)}"
169
+ print("[PASS] 抽屉卡元素归属:上沿外气泡滤掉、跨沿标题保留")
170
+
171
+ # 端到端:focus_artboard 必须真产出 card-1.png + mask 圆角(几何直取的卡)
172
+ import shutil
173
+ import tempfile
174
+ import png_utils # noqa: E402
175
+ tmp = Path(tempfile.mkdtemp(prefix="cb-subcard-"))
176
+ try:
177
+ prev = tmp / "artboard.png"
178
+ pw, ph = 750, 1624
179
+ png_utils.write_png(str(prev), pw, ph, 4, [b"\xff" * (pw * 4)] * ph)
180
+ cdir = tmp / "out"
181
+ cdir.mkdir()
182
+ spec = pm.focus_artboard(BOTTOM_SHEET, prev, cdir)
183
+ assert len(spec["cards"]) == 1, f"focus_artboard 应为抽屉产 1 张卡,实际 {len(spec['cards'])}"
184
+ card = spec["cards"][0]
185
+ assert card.get("image") == "card-1.png" and (cdir / "card-1.png").exists(), "card-1.png 必须实产"
186
+ assert (card.get("mask") or {}).get("radius") == [20, 20, 0, 0], \
187
+ f"mask 圆角应取自面板几何,实际 {card.get('mask')}"
188
+ assert spec["focusSkipReason"] == "bottom_sheet_geometry", \
189
+ "focusSkipReason 不得改变(classify_artboard / trainer 依赖它)"
190
+ print("[PASS] focus_artboard 端到端:card-1.png + mask.radius 实产,focusSkipReason 不变")
191
+ finally:
192
+ shutil.rmtree(tmp, ignore_errors=True)
193
+
142
194
  # 卡片级切图判定(房贷 32 型)单测:中段大盘切图算「板上有卡」,图标切图不算
143
195
  flat = vision._flatten_with_tree(CHAT_WITH_SLICED_CARD["layers"])
144
196
  assert vision.has_card_like_visual(flat, 375, 812) is True, "343x280 的中段切图应判为卡片级"
@@ -146,10 +198,40 @@ def main():
146
198
  assert vision.has_card_like_visual(flat_text_only, 375, 812) is False, "30x30 图标切图不该判为卡片"
147
199
  print("[PASS] has_card_like_visual:中段大盘切图算卡,小图标不算")
148
200
 
201
+ # 整卡单切图兜底(2026-09-28):0 卡画板上的卡片级大盘切图提升为 1 张真卡,
202
+ # 让「对话 + 内嵌卡(整卡导出为一张图)」形态进入训练集;纯单切图才兜底。
203
+ found = pm.detect_artboard_cards(CHAT_WITH_SLICED_CARD)
204
+ assert len(found["cards"]) == 1, f"整卡单切图应兜底为 1 张卡,实际 {len(found['cards'])}"
205
+ fx, fy, fw, fh, f_els, f_shapes, _fm = found["cards"][0]
206
+ assert (fx, fy, fw, fh) == (16, 276, 343, 280), f"兜底卡矩形应取切图几何,实际 {(fx, fy, fw, fh)}"
207
+ assert len(f_els) == 1 and f_els[0].is_slice, "纯单切图兜底:归属元素应只有切图本身"
208
+ # 混入其他标注(气泡文字渗进切图区域)→ 不兜底,维持 0 卡
209
+ MIXED = ab("32房贷利率调整_混合标注", chrome() + bubble(
210
+ 196, 100, 163, 42, text("调整下我的房贷利率", 208, 110, 140, 22)) + [
211
+ L("应答气泡", "shape", 16, 156, 343, 108, radius=[0, 12, 12, 12], hexv="#FFFFFFFF"),
212
+ text("您的贷款为深圳地区二套住房贷款……", 30, 166, 315, 88),
213
+ L("编组 4", "slice", 16, 276, 343, 280),
214
+ text("浮层标注", 30, 300, 200, 24),
215
+ ])
216
+ found_mixed = pm.detect_artboard_cards(MIXED)
217
+ assert len(found_mixed["cards"]) == 0, \
218
+ f"切图区域内混有文本标注时不得兜底,实际 {len(found_mixed['cards'])} 卡"
219
+ print("[PASS] 整卡单切图兜底:纯切图 → 1 卡(矩形=切图几何);混入标注 → 不兜底")
220
+
221
+ # 同名画板消歧(2026-09-24):Sketch 允许两个画板**完全同名**——实测「地址管理」稿
222
+ # 25 板里两个「11…_失败_再次修改」(375×1232/129 层 vs 375×1252/130 层,两个不同设计)。
223
+ # 目录名直接用 name 时后跑的会整板覆盖先跑的(产物静默丢失),且 manifest 两条 entry
224
+ # 指向同一目录、下游按 name 定位(generate_cards.mjs)两行同名无法区分。
225
+ uniq = pm.unique_canvas_names(["A_首页", "A_首页", "B_备用", "A_首页"])
226
+ assert uniq == ["A_首页", "A_首页-2", "B_备用", "A_首页-3"], f"同名消歧结果不符,实际 {uniq}"
227
+ assert len(set(uniq)) == len(uniq), "消歧后必须两两不同(否则仍会互相覆盖)"
228
+ assert pm.unique_canvas_names(["唯一板"]) == ["唯一板"], "无重名时不得改动画板名(下游零感知)"
229
+ print("[PASS] 同名画板消歧:第 2 个起追加 -2/-3,无重名时原名不动")
230
+
149
231
  if failed:
150
232
  print(f"\n{failed} 个用例失败")
151
233
  return 1
152
- print(f"\n全部 {len(CASES)} 个用例通过")
234
+ print(f"\n全部 {len(CASES)} 个用例 + 抽屉元素归属 + 端到端产出 + 同名消歧 通过")
153
235
  return 0
154
236
 
155
237