@lark-apaas/coding-steering 0.1.32-dev.942e73f → 0.1.32-dev.f3c32d8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/coding-steering",
-  "version": "0.1.32-dev.942e73f",
+  "version": "0.1.32-dev.f3c32d8",
   "description": "Stack-specific steering content for miaoda-coding templates",
   "type": "module",
   "files": [

package/steering/design-html/skills/pptx-style-extract/SKILL.md

@@ -133,16 +133,16 @@ When generating a deck:
 2. Build `<deck-stage width="<canvas width>" height="<canvas height>">` using the `canvas` declared in `layouts.md` — source decks are not always 16:9, and a default-sized stage shifts every coordinate on the page. Each slide is one static `<section data-pptx-layout="<chosen archetype>">`.
 3. Inline CSS variables from `design.md` into the HTML `<style>` block using a `--ppt-*` prefix.
 4. **位移动画用独立的 `translate` 属性**：`@keyframes fadeUp { from{opacity:0; translate:0 24px} to{opacity:1; translate:0 0} }`。`transform` 是单一属性，动画里碰它会覆盖掉元素原有的那条（`left:50%; transform:translateX(-50%)` 的居中就此丢失）；`translate` / `rotate` / `scale` 各自独立，与已有 `transform` 叠加。
-5. Map `layouts.md` slots to absolute-positioned elements inside each section: expand `box: [x,y,w,h]` mechanically to `left/top/width/height`, then apply the slot's `css` declaration string unchanged. `box` owns geometry; `css` owns all rendering style, including the template's text padding, typography, alignment, line height, letter spacing, and rotation. Do not reinterpret PPTX fields or replace slot CSS with your own type scale. A slot with `asset` is a fixed image element (logo, mark): place that asset at that box on that archetype only. Do not reflow any of this as generic web grids.
+5. Map `layouts.md` slots to absolute-positioned elements inside each section: expand `box: [x,y,w,h]` mechanically to `left/top/width/height`, then apply the slot's `css` declaration string unchanged. `box` owns geometry; `css` owns all rendering style, including the template's text padding, typography, alignment, line height, letter spacing, and rotation. Do not reinterpret PPTX fields or replace slot CSS with your own type scale. A slot with `asset` is a fixed image element: use that exact asset at that box on that archetype only; do not omit or replace it. Do not reflow any of this as generic web grids.
 6. Copy `<pack_dir>/assets/` into the project, for example `assets/pptx-style/<pack-name>/`, and reference those copied files with relative URLs. The scratch `tmp/pptx-style-extract/...` path must never appear in the final HTML.
 7. Use the font stacks and fallback rules from `design.md`; do not install fonts or dependencies at runtime.
-8. Before the regular slide preflight, verify every template logo against the selected archetype:
+8. Before the regular slide preflight, verify every background and fixed image asset against the selected archetype:
 
    ```bash
-   PYTHONDONTWRITEBYTECODE=1 python3 -B scripts/verify_logo_scope.py <pack_dir> <index.html> --asset-prefix <copied-assets-prefix>
+   PYTHONDONTWRITEBYTECODE=1 python3 -B scripts/verify_layout_assets.py <pack_dir> <index.html> --asset-prefix <copied-assets-prefix>
    ```
 
-   `PPTX_LOGO_SCOPE: FAIL` means remove or move every listed logo according to `layouts.md`, then rerun this command.
+   `PPTX_LAYOUT_ASSETS: FAIL` means add every missing bound asset and remove every cross-layout use according to `layouts.md`, then rerun this command.
 9. Run the slide preflight checks: no resource failures, no section overflow, and sampled screenshots follow the package colors, typography, layouts, assets, and Hard Rules.
 
 ## Export Consumer Attachments

package/steering/design-html/skills/pptx-style-extract/scripts/draft.py

@@ -981,6 +981,13 @@ def background_decor(background, canvas):
             'trace': 'canvas-background'}
 
 
+def background_identity(background):
+    """返回可用于聚类和审计的稳定背景标识，不改变背景的原始表达。"""
+    if isinstance(background, dict):
+        return json.dumps(background, sort_keys=True, separators=(',', ':'))
+    return background
+
+
 # ---------------------------------------------------------------- 版式聚类
 DECOR_MIN = 40.0
 
@@ -1539,16 +1546,19 @@ def draft_layouts(d, outdir, effective_alpha=None):
     image_marks = slide_image_marks(d, overlay_media)
 
     bg_of_slide, layout_of_slide = {}, {}
-    bg_of_layout = {row['part']: row.get('background') for row in d.get('layouts') or []}
+    background_of_layout = {
+        row['part']: row.get('background') for row in d.get('layouts') or []
+    }
     for s in d.get('slides', []):
         bg = s.get('background')
-        bg_of_slide[s['part']] = json.dumps(bg, sort_keys=True) if isinstance(bg, dict) else bg
+        bg_of_slide[s['part']] = background_identity(bg)
         layout_of_slide[s['part']] = s.get('layout')
     # 版式层的满屏底图（form=2 常态：底图挂在 layout 上）
     composites = d.get('background_composites') or {}
+    bg_media_of_layout = {}
     for s in shapes:
         if s.get('layer') == 'layout' and is_bleed(s) and s.get('media'):
-            bg_of_layout[s['part']] = s['media']
+            bg_media_of_layout[s['part']] = s['media']
 
     pages = []
     for part, sh in sorted(by_slide.items(), key=lambda kv: slide_no(kv[0])):
@@ -1556,7 +1566,7 @@ def draft_layouts(d, outdir, effective_alpha=None):
         layout_shapes = by_layout.get(layout_part) or []
         bg_media = top_bleed_media(sh)
         if bg_media is None:
-            bg_media = bg_of_layout.get(layout_part)
+            bg_media = bg_media_of_layout.get(layout_part)
         rendered_bg = (composites.get(part)
                        or composites.get(layout_part)
                        or bg_media)
@@ -1602,7 +1612,7 @@ def draft_layouts(d, outdir, effective_alpha=None):
                 marks.append(mark)
         background = next((s.get('background') for s in d.get('slides') or []
                            if s.get('part') == part and s.get('background')), None)
-        background = background or bg_of_layout.get(layout_part)
+        background = background or background_of_layout.get(layout_part)
         pages.append({'part': part, 'no': slide_no(part), 'bg_media': bg_media,
                       'rendered_bg': rendered_bg,
                       'bg_color': bg_of_slide.get(part), 'background': background,
@@ -1632,7 +1642,11 @@ def draft_layouts(d, outdir, effective_alpha=None):
             # 不替模型下结论。和首页一样，拆组只避免它被聚类代表页吞掉。
             groups[('__last__', -2)] = [p]
             continue
-        groups[(p['bg_media'] or p['bg_color'] or 'none', density_band(p))].append(p)
+        background_key = background_identity(
+            p.get('rendered_bg') or p.get('bg_media')
+            or p.get('background') or p.get('bg_color')
+        ) or 'none'
+        groups[(background_key, density_band(p))].append(p)
 
     ranked = sorted(groups.items(), key=lambda kv: (-len(kv[1]), kv[1][0]['no']))
     # 首页所在的组一定收——deck 的第一页是模板的门面，孤例也不能被名额挤掉。
@@ -1654,15 +1668,9 @@ def draft_layouts(d, outdir, effective_alpha=None):
     leftover = sorted(p['no'] for g in ranked if g not in kept for p in g[1])
 
     archetypes = []
-    for gi, ((bg_raw, _band), ps) in enumerate(kept, 1):
+    for gi, ((_background_key, _band), ps) in enumerate(kept, 1):
         rep = max(ps, key=lambda p: len(p['texts']))
-        if bg_raw == '__first__':
-            bg_raw = rep['bg_media'] or rep['bg_color'] or 'none'
-        elif bg_raw == '__last__':
-            bg_raw = rep['bg_media'] or rep['bg_color'] or 'none'
-        rendered_bg = rep.get('rendered_bg')
-        if rendered_bg:
-            bg_raw = rendered_bg
+        bg_raw = rep.get('rendered_bg') or rep.get('bg_media')
         name = 'layout-%d' % gi
         # 标题按「位置 + 跨度」认，不按字号——big-number 类的巨号数值常比标题还大
         # 标题 = 该页最靠上的那批文本里最宽的一块。不按「画布前 28%」这类固定比例切：
@@ -1739,9 +1747,13 @@ def draft_layouts(d, outdir, effective_alpha=None):
                                p['layout'] for p in ps if p.get('layout')
                            }),
                            '_source_backgrounds': sorted({
-                               p.get('rendered_bg') or p.get('bg_media') or p.get('bg_color')
+                               background_identity(
+                                   p.get('rendered_bg') or p.get('bg_media')
+                                   or p.get('background') or p.get('bg_color')
+                               )
                                for p in ps
-                               if p.get('rendered_bg') or p.get('bg_media') or p.get('bg_color')
+                               if (p.get('rendered_bg') or p.get('bg_media')
+                                   or p.get('background') or p.get('bg_color'))
                            }),
                            '_text_n': len(rep['texts']),
                            '_last_page_candidate': rep['no'] == last_page_no,
@@ -3044,7 +3056,7 @@ def emit_body(d, tokens, fonts, roles, assets, archetypes, exceptions, cusage, l
           '页数多于页型时，挑最接近的一个原样套用它的 slot：用不到的槽删掉，'
           '内容比槽多就按同类槽的间距等距加，**坐标一律沿用该页型给的那套，不要自己另起网格**。'
           '每个生成页面的 `<section>` 都写 `data-pptx-layout="<页型名>"`，'
-          '交付前据此核验 logo 只出现在该页型的资产槽中。' % sidecar,
+          '交付前据此核验该页型绑定的背景与图片资产均已使用，且没有跨页型误用。' % sidecar,
           '3. **按页型给的形态落元素** —— 页型给 `flow` 就用流式，给 `slots` 就用绝对，'
           '两者只会出现一个。'
           '**flow**：整块用一个纵向 flex 容器，`top` 是它的起始 y，`margin` 是整块的左右边距，'
@@ -3063,7 +3075,7 @@ def emit_body(d, tokens, fonts, roles, assets, archetypes, exceptions, cusage, l
           '`[x, y, w, h]`（%dx%d 画布上的绝对像素），机械展开成 `left/top/width/height`；'
           'slot 的 `css` 是模板排版属性已转译好的声明串，原样写进 style，不要另选字号、'
           '内边距、颜色或对齐。'
-          '带 `asset` 的 slot 是图片元素（logo、角标），把该资产放在它自己的 `box` 里；'
+          '带 `asset` 的 slot 是固定图片元素，把该资产放在它自己的 `box` 里，不得省略或换图；'
           '这个页型没有 `asset` 槽，这一页就不出现该资产。' % (canvas[0], canvas[1]),
           '5. **铺装饰几何** —— 页型的 `decor` 是这一页的图形骨架（图标托底的圆、'
           '卡片、分隔线）：每条渲染成一个绝对定位空元素，`box` 给位置，`css` 逐项原样写进 '

package/steering/design-html/skills/pptx-style-extract/scripts/test_design_consumer_contract.py

@@ -61,7 +61,8 @@ class DesignConsumerContractTest(unittest.TestCase):
         self.assertIn('确认全部页型后再开始搭页', body)
         self.assertIn('不能只看摘要、前几个页型', body)
         self.assertIn('data-pptx-layout="<页型名>"', body)
-        self.assertIn('交付前据此核验 logo 只出现在该页型的资产槽中', body)
+        self.assertIn('该页型绑定的背景与图片资产均已使用', body)
+        self.assertIn('不得省略或换图', body)
 
 
 if __name__ == '__main__':

package/steering/design-html/skills/pptx-style-extract/scripts/test_layout_css.py

@@ -1185,6 +1185,85 @@ layouts:
         self.assertIn('value: "[0, 0, 1920, 1080]"', manifest)
         self.assertIn('reason: "PPT 背景铺满画布"', manifest)
 
+    def test_sampled_layouts_group_inherited_structured_background(self):
+        layout_part = 'ppt/slideLayouts/slideLayout1.xml'
+        slides = [{
+            'part': 'ppt/slides/slide%d.xml' % index,
+            'layout': layout_part,
+            'background': None,
+        } for index in range(1, 4)]
+        data = {
+            'canvas': {'px': [1920, 1080]},
+            'form_hint': {'form': 1},
+            'layouts': [{
+                'part': layout_part,
+                'name': '内容',
+                'used_by_slides': 3,
+            }],
+            'slides': slides,
+            'images': [],
+            'media': [],
+            'theme_topology': {'themes': ['single'], 'per_master': [], 'default': 'single'},
+            'reference_graph': {
+                'master_of_layout': {},
+                'layout_of_slide': {
+                    slide['part']: layout_part for slide in slides
+                },
+            },
+            'background_composites': {},
+        }
+        shapes = [{
+            'part': slide['part'],
+            'layer': 'slide',
+            'kind': 'sp',
+            'box': {'x': 100, 'y': 100, 'w': 600, 'h': 100},
+            'ph': {'type': 'title', 'idx': '1'},
+            'text': {'paragraphs': [{'runs': [{
+                'text': 'Title %d' % index,
+                'sz_px': 40,
+            }]}]},
+        } for index, slide in enumerate(slides, 1)]
+
+        backgrounds = [{
+            'source': 'bgPr',
+            'type': 'solid',
+            'color': {'resolved': '#FAF9F5'},
+        }, {
+            'type': 'gradient',
+            'stops': [
+                {'pos': 0, 'color': {'resolved': '#4B5CF5'}},
+                {'pos': 100, 'color': {'resolved': '#233AFB'}},
+            ],
+            'angle_deg': 0,
+        }]
+        for background in backgrounds:
+            with self.subTest(background=background['type']):
+                data['layouts'][0]['background'] = background
+                with tempfile.TemporaryDirectory() as output_dir:
+                    os.makedirs(os.path.join(output_dir, 'ref'))
+                    with open(os.path.join(output_dir, 'ref', 'shapes.json'), 'w',
+                              encoding='utf-8') as stream:
+                        import json
+                        json.dump({'shapes': shapes}, stream)
+                    archetypes, pages, _ = draft_layouts(
+                        data, output_dir, effective_alpha={})
+
+                self.assertEqual([1, 2, 3], sorted(
+                    page for archetype in archetypes for page in archetype['pages']))
+                self.assertTrue(all(page['background'] == background for page in pages))
+                self.assertTrue(all(archetype['bg_raw'] is None
+                                    for archetype in archetypes))
+                self.assertTrue(all(
+                    any(decor.get('trace') == 'canvas-background'
+                        for decor in archetype['decor'])
+                    for archetype in archetypes
+                ))
+                self.assertTrue(all(
+                    all(isinstance(value, str)
+                        for value in archetype['_source_backgrounds'])
+                    for archetype in archetypes
+                ))
+
     def test_asset_vision_groups_fail_when_page_screenshot_is_unreadable(self):
         candidates = [{
             'id': 'asset-1',

package/steering/design-html/skills/pptx-style-extract/scripts/test_logo_scope.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
-"""Regression tests for template logo placement in generated deck HTML."""
+"""Regression tests for template asset placement in generated deck HTML."""
 import os
+import subprocess
 import sys
 import tempfile
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
-from verify_logo_scope import validate_logo_scope
+from verify_layout_assets import validate_layout_assets
 
 
-class LogoScopeTest(unittest.TestCase):
+class LayoutAssetContractTest(unittest.TestCase):
     def write_pack(self, root):
         with open(os.path.join(root, 'design.md'), 'w', encoding='utf-8') as stream:
             stream.write(
@@ -48,6 +49,57 @@ class LogoScopeTest(unittest.TestCase):
             stream.write(content)
         return path
 
+    def write_texture_pack(self, root):
+        with open(os.path.join(root, 'design.md'), 'w', encoding='utf-8') as stream:
+            stream.write(
+                '---\n'
+                'assets:\n'
+                '  texture-1:\n'
+                '    path: assets/textures/1.webp\n'
+                '    kind: texture\n'
+                'layouts: layouts.md\n'
+                '---\n'
+            )
+        with open(os.path.join(root, 'layouts.md'), 'w', encoding='utf-8') as stream:
+            stream.write(
+                '---\n'
+                'canvas: 1920x1080\n'
+                'layouts:\n'
+                '  cover:\n'
+                '    role: cover\n'
+                '    slots:\n'
+                '      - {role: texture, box: [1142, 0, 778, 1080], type: pic, asset: texture-1}\n'
+                '  content:\n'
+                '    role: content\n'
+                '    slots:\n'
+                '      - {role: title, box: [100, 100, 800, 100], type: title}\n'
+                '---\n'
+            )
+
+    def write_background_pack(self, root):
+        with open(os.path.join(root, 'design.md'), 'w', encoding='utf-8') as stream:
+            stream.write(
+                '---\n'
+                'assets:\n'
+                '  bg-content-1:\n'
+                '    path: assets/backgrounds/content.webp\n'
+                '    kind: background\n'
+                'layouts: layouts.md\n'
+                '---\n'
+            )
+        with open(os.path.join(root, 'layouts.md'), 'w', encoding='utf-8') as stream:
+            stream.write(
+                '---\n'
+                'canvas: 1920x1080\n'
+                'layouts:\n'
+                '  content:\n'
+                '    role: content\n'
+                '    background: bg-content-1\n'
+                '    slots:\n'
+                '      - {role: title, box: [100, 100, 800, 100], type: title}\n'
+                '---\n'
+            )
+
     def test_logo_is_limited_to_every_archetype_with_its_slot(self):
         with tempfile.TemporaryDirectory() as root:
             self.write_pack(root)
@@ -64,7 +116,7 @@ class LogoScopeTest(unittest.TestCase):
 
             self.assertEqual(
                 [],
-                validate_logo_scope(root, html, 'assets/pptx-volcengine'),
+                validate_layout_assets(root, html, 'assets/pptx-volcengine'),
             )
 
     def test_logo_on_an_unowned_archetype_is_rejected(self):
@@ -78,7 +130,7 @@ class LogoScopeTest(unittest.TestCase):
                 '</deck-stage>',
             )
 
-            problems = validate_logo_scope(root, html, 'assets/pptx-volcengine')
+            problems = validate_layout_assets(root, html, 'assets/pptx-volcengine')
 
             self.assertEqual(1, len(problems))
             self.assertIn('content', problems[0])
@@ -96,7 +148,7 @@ class LogoScopeTest(unittest.TestCase):
 
             self.assertEqual(
                 [],
-                validate_logo_scope(root, html, 'assets/pptx-volcengine'),
+                validate_layout_assets(root, html, 'assets/pptx-volcengine'),
             )
 
     def test_each_slide_declares_its_template_archetype(self):
@@ -108,8 +160,8 @@ class LogoScopeTest(unittest.TestCase):
             )
 
             self.assertEqual(
-                ['第 1 页缺少 data-pptx-layout，无法核验模板 logo 归属'],
-                validate_logo_scope(root, html, 'assets/pptx-volcengine'),
+                ['第 1 页缺少 data-pptx-layout，无法核验模板资产归属'],
+                validate_layout_assets(root, html, 'assets/pptx-volcengine'),
             )
 
     def test_logo_in_global_css_is_rejected(self):
@@ -123,8 +175,8 @@ class LogoScopeTest(unittest.TestCase):
             )
 
             self.assertEqual(
-                ['模板 logo logo-1 出现在 slide section 外，无法核验页型归属'],
-                validate_logo_scope(root, html, 'assets/pptx-volcengine'),
+                ['模板资产 logo-1 出现在 slide section 外，无法核验页型归属'],
+                validate_layout_assets(root, html, 'assets/pptx-volcengine'),
             )
 
     def test_logo_in_a_slide_style_block_is_rejected(self):
@@ -139,10 +191,111 @@ class LogoScopeTest(unittest.TestCase):
             )
 
             self.assertEqual(
-                ['模板 logo logo-1 出现在 slide section 外，无法核验页型归属'],
-                validate_logo_scope(root, html, 'assets/pptx-volcengine'),
+                ['模板资产 logo-1 出现在 slide section 外，无法核验页型归属'],
+                validate_layout_assets(root, html, 'assets/pptx-volcengine'),
             )
 
+    def test_layout_must_use_its_bound_texture(self):
+        with tempfile.TemporaryDirectory() as root:
+            self.write_texture_pack(root)
+            html = self.write_html(
+                root,
+                '<deck-stage><section data-pptx-layout="cover">'
+                '<img src="assets/generated/replacement.webp"></section></deck-stage>',
+            )
+
+            problems = validate_layout_assets(root, html, 'assets/pptx-claude')
+
+            self.assertEqual(1, len(problems))
+            self.assertIn('cover', problems[0])
+            self.assertIn('texture-1', problems[0])
+            self.assertIn('必须使用', problems[0])
+
+    def test_layout_bound_texture_on_an_unowned_layout_is_rejected(self):
+        with tempfile.TemporaryDirectory() as root:
+            self.write_texture_pack(root)
+            html = self.write_html(
+                root,
+                '<deck-stage><section data-pptx-layout="content">'
+                '<img src="assets/pptx-claude/textures/1.webp"></section></deck-stage>',
+            )
+
+            problems = validate_layout_assets(root, html, 'assets/pptx-claude')
+
+            self.assertEqual(1, len(problems))
+            self.assertIn('content', problems[0])
+            self.assertIn('texture-1', problems[0])
+            self.assertIn('不得使用', problems[0])
+
+    def test_layout_must_use_its_bound_background_with_query_and_fragment(self):
+        with tempfile.TemporaryDirectory() as root:
+            self.write_background_pack(root)
+            html = self.write_html(
+                root,
+                '<deck-stage><section data-pptx-layout="content" '
+                'style="background-image:url('
+                '\'assets/pptx-claude/backgrounds/content.webp?v=2#slide\')">'
+                '正文</section></deck-stage>',
+            )
+
+            self.assertEqual(
+                [],
+                validate_layout_assets(root, html, 'assets/pptx-claude'),
+            )
+
+    def test_repeated_asset_slots_require_repeated_placements(self):
+        with tempfile.TemporaryDirectory() as root:
+            self.write_texture_pack(root)
+            with open(os.path.join(root, 'layouts.md'), 'w', encoding='utf-8') as stream:
+                stream.write(
+                    '---\n'
+                    'canvas: 1920x1080\n'
+                    'layouts:\n'
+                    '  cover:\n'
+                    '    role: cover\n'
+                    '    slots:\n'
+                    '      - {role: texture, box: [0, 0, 100, 100], type: pic, asset: texture-1}\n'
+                    '      - {role: texture, box: [1800, 980, 100, 100], type: pic, asset: texture-1}\n'
+                    '---\n'
+                )
+            html = self.write_html(
+                root,
+                '<deck-stage><section data-pptx-layout="cover">'
+                '<img src="assets/pptx-claude/textures/1.webp"></section></deck-stage>',
+            )
+
+            problems = validate_layout_assets(root, html, 'assets/pptx-claude')
+
+            self.assertEqual(1, len(problems))
+            self.assertIn('共 2 处', problems[0])
+            self.assertIn('缺少 1 处', problems[0])
+
+    def test_legacy_logo_scope_entrypoint_keeps_failure_exit_code(self):
+        with tempfile.TemporaryDirectory() as root:
+            self.write_texture_pack(root)
+            html = self.write_html(
+                root,
+                '<deck-stage><section data-pptx-layout="cover">'
+                '<img src="assets/generated/replacement.webp"></section></deck-stage>',
+            )
+
+            result = subprocess.run(
+                [
+                    sys.executable,
+                    os.path.join(os.path.dirname(__file__), 'verify_logo_scope.py'),
+                    root,
+                    html,
+                    '--asset-prefix',
+                    'assets/pptx-claude',
+                ],
+                capture_output=True,
+                check=False,
+                text=True,
+            )
+
+            self.assertEqual(1, result.returncode)
+            self.assertIn('PPTX_LAYOUT_ASSETS: FAIL', result.stdout)
+
 
 if __name__ == '__main__':
     unittest.main()

package/steering/design-html/skills/pptx-style-extract/scripts/verify_layout_assets.py

@@ -0,0 +1,206 @@
+#!/usr/bin/env python3
+"""Verify that generated slides honor every asset bound to their PPTX layout."""
+import argparse
+import posixpath
+import re
+import sys
+from collections import Counter
+from html.parser import HTMLParser
+from urllib.parse import urlsplit
+
+from check_v2 import Pack
+
+
+URL_RE = re.compile(r'url\(\s*[\'"]?([^\'")\s]+)', re.I)
+VOID_TAGS = {
+    'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
+    'link', 'meta', 'param', 'source', 'track', 'wbr',
+}
+
+
+def normalized_path(value):
+    path = urlsplit(value).path.replace('\\', '/')
+    return posixpath.normpath(path).lstrip('./')
+
+
+def bound_asset_ids(value, known_asset_ids):
+    found = Counter()
+    if isinstance(value, dict):
+        for key, child in value.items():
+            if (key in ('asset', 'background')
+                    and isinstance(child, str)
+                    and child in known_asset_ids):
+                found[child] += 1
+            found.update(bound_asset_ids(child, known_asset_ids))
+    elif isinstance(value, list):
+        for child in value:
+            found.update(bound_asset_ids(child, known_asset_ids))
+    return found
+
+
+def layout_asset_contract(pack):
+    known_asset_ids = set(pack.assets)
+    required = {}
+    owners = {}
+    for layout_name, (layout, _) in pack.layouts.items():
+        asset_counts = bound_asset_ids(layout, known_asset_ids)
+        required[layout_name] = asset_counts
+        for asset_id in asset_counts:
+            owners.setdefault(asset_id, set()).add(layout_name)
+    return required, owners
+
+
+def asset_urls(pack, asset_prefix, asset_ids):
+    prefix = normalized_path(asset_prefix).rstrip('/')
+    urls = {}
+    for asset_id in asset_ids:
+        entry, _ = pack.assets.get(asset_id, (None, None))
+        if not isinstance(entry, dict):
+            continue
+        path = entry.get('path')
+        if not isinstance(path, str) or not path:
+            continue
+        relative = normalized_path(path)
+        if relative.startswith('assets/'):
+            relative = relative[len('assets/'):]
+        urls[posixpath.join(prefix, relative)] = asset_id
+    return urls
+
+
+def urls_from_attrs(attrs):
+    urls = []
+    for key, value in attrs:
+        if not value:
+            continue
+        if key.lower() in ('src', 'href'):
+            urls.append(value)
+        elif key.lower() == 'srcset':
+            urls.extend(item.strip().split(' ', 1)[0] for item in value.split(','))
+        elif key.lower() == 'style':
+            urls.extend(URL_RE.findall(value))
+    return urls
+
+
+class SlideAssetParser(HTMLParser):
+    def __init__(self):
+        super().__init__()
+        self.slides = []
+        self._tags = []
+        self._sections = []
+        self._active_slides = []
+        self._style_depth = 0
+        self.outside_urls = []
+
+    def handle_starttag(self, tag, attrs):
+        tag = tag.lower()
+        urls = urls_from_attrs(attrs)
+        parent = self._tags[-1] if self._tags else None
+        if tag == 'section':
+            slide = (
+                {'layout': dict(attrs).get('data-pptx-layout'), 'urls': urls}
+                if parent == 'deck-stage' else None
+            )
+            self._sections.append(slide)
+            if slide is not None:
+                self._active_slides.append(slide)
+        elif self._active_slides:
+            self._active_slides[-1]['urls'].extend(urls)
+        else:
+            self.outside_urls.extend(urls)
+        if tag == 'style':
+            self._style_depth += 1
+        if tag not in VOID_TAGS:
+            self._tags.append(tag)
+
+    def handle_startendtag(self, tag, attrs):
+        if self._active_slides:
+            self._active_slides[-1]['urls'].extend(urls_from_attrs(attrs))
+        else:
+            self.outside_urls.extend(urls_from_attrs(attrs))
+
+    def handle_endtag(self, tag):
+        tag = tag.lower()
+        if tag == 'style' and self._style_depth:
+            self._style_depth -= 1
+        if tag == 'section' and self._sections:
+            slide = self._sections.pop()
+            if slide is not None:
+                self.slides.append(slide)
+                self._active_slides.pop()
+        if tag not in VOID_TAGS and self._tags:
+            self._tags.pop()
+
+    def handle_data(self, data):
+        if not self._style_depth:
+            return
+        self.outside_urls.extend(URL_RE.findall(data))
+
+
+def validate_layout_assets(pack_dir, html_path, asset_prefix):
+    """Return violations of the asset contract declared by each layout."""
+    pack = Pack(pack_dir)
+    required, owners = layout_asset_contract(pack)
+    known_urls = asset_urls(pack, asset_prefix, owners)
+    if not known_urls:
+        return []
+
+    with open(html_path, encoding='utf-8') as stream:
+        text = stream.read()
+    parser = SlideAssetParser()
+    parser.feed(text)
+    parser.close()
+
+    problems = []
+    for url in parser.outside_urls:
+        asset_id = known_urls.get(normalized_path(url))
+        if asset_id:
+            problems.append(
+                '模板资产 %s 出现在 slide section 外，无法核验页型归属' % asset_id)
+    for number, slide in enumerate(parser.slides, 1):
+        layout = slide['layout']
+        if not layout:
+            problems.append('第 %d 页缺少 data-pptx-layout，无法核验模板资产归属' % number)
+            continue
+        if layout not in pack.layouts:
+            problems.append('第 %d 页声明了不存在的模板页型: %s' % (number, layout))
+            continue
+        used_asset_counts = Counter(
+            known_urls[normalized_path(url)]
+            for url in slide['urls']
+            if normalized_path(url) in known_urls
+        )
+        for asset_id in sorted(used_asset_counts):
+            if layout not in owners.get(asset_id, set()):
+                allowed = '、'.join(sorted(owners.get(asset_id) or ())) or '（无）'
+                problems.append(
+                    '第 %d 页页型 %s 不得使用 %s；只允许: %s'
+                    % (number, layout, asset_id, allowed))
+        for asset_id, required_count in sorted(required.get(layout, {}).items()):
+            missing_count = required_count - used_asset_counts[asset_id]
+            if missing_count > 0:
+                problems.append(
+                    '第 %d 页页型 %s 必须使用其绑定资产 %s 共 %d 处，当前缺少 %d 处'
+                    % (number, layout, asset_id, required_count, missing_count))
+    return problems
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(
+        description='Verify that generated deck HTML honors PPTX layout asset bindings.')
+    parser.add_argument('pack_dir')
+    parser.add_argument('html_path')
+    parser.add_argument('--asset-prefix', required=True)
+    args = parser.parse_args(argv)
+
+    problems = validate_layout_assets(args.pack_dir, args.html_path, args.asset_prefix)
+    if not problems:
+        print('PPTX_LAYOUT_ASSETS: PASS')
+        return 0
+    print('PPTX_LAYOUT_ASSETS: FAIL count=%d' % len(problems))
+    for problem in problems:
+        print('[layoutAssets] %s' % problem)
+    return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())

package/steering/design-html/skills/pptx-style-extract/scripts/verify_logo_scope.py

@@ -1,187 +1,11 @@
 #!/usr/bin/env python3
-"""Verify that generated slides use template logos only on owning archetypes."""
-import argparse
-import posixpath
-import re
+"""Backward-compatible entrypoint for PPTX layout asset verification."""
 import sys
-from html.parser import HTMLParser
-from urllib.parse import urlsplit
 
-from check_v2 import Pack
+from verify_layout_assets import main, validate_layout_assets
 
 
-URL_RE = re.compile(r'url\(\s*[\'"]?([^\'")\s]+)', re.I)
-VOID_TAGS = {
-    'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
-    'link', 'meta', 'param', 'source', 'track', 'wbr',
-}
-
-
-def normalized_path(value):
-    path = urlsplit(value).path.replace('\\', '/')
-    return posixpath.normpath(path).lstrip('./')
-
-
-def asset_urls(pack, asset_prefix):
-    prefix = normalized_path(asset_prefix).rstrip('/')
-    urls = {}
-    for asset_id, (entry, _) in pack.assets.items():
-        if not isinstance(entry, dict) or entry.get('kind') != 'logo':
-            continue
-        path = entry.get('path')
-        if not isinstance(path, str) or not path:
-            continue
-        relative = normalized_path(path)
-        if relative.startswith('assets/'):
-            relative = relative[len('assets/'):]
-        urls[posixpath.join(prefix, relative)] = asset_id
-    return urls
-
-
-def contains_asset(value, asset_id):
-    if isinstance(value, dict):
-        return (value.get('asset') == asset_id
-                or any(contains_asset(child, asset_id) for child in value.values()))
-    if isinstance(value, list):
-        return any(contains_asset(child, asset_id) for child in value)
-    return False
-
-
-def logo_owners(pack):
-    owners = {}
-    for asset_url, asset_id in asset_urls(pack, '').items():
-        del asset_url
-        owners[asset_id] = {
-            name
-            for name, (layout, _) in pack.layouts.items()
-            if contains_asset(layout, asset_id)
-        }
-    return owners
-
-
-def urls_from_attrs(attrs):
-    urls = []
-    for key, value in attrs:
-        if not value:
-            continue
-        if key.lower() in ('src', 'href'):
-            urls.append(value)
-        elif key.lower() == 'srcset':
-            urls.extend(item.strip().split(' ', 1)[0] for item in value.split(','))
-        elif key.lower() == 'style':
-            urls.extend(URL_RE.findall(value))
-    return urls
-
-
-class SlideAssetParser(HTMLParser):
-    def __init__(self):
-        super().__init__()
-        self.slides = []
-        self._tags = []
-        self._sections = []
-        self._active_slides = []
-        self._style_depth = 0
-        self.outside_urls = []
-
-    def handle_starttag(self, tag, attrs):
-        tag = tag.lower()
-        urls = urls_from_attrs(attrs)
-        parent = self._tags[-1] if self._tags else None
-        if tag == 'section':
-            slide = (
-                {'layout': dict(attrs).get('data-pptx-layout'), 'urls': urls}
-                if parent == 'deck-stage' else None
-            )
-            self._sections.append(slide)
-            if slide is not None:
-                self._active_slides.append(slide)
-        elif self._active_slides:
-            self._active_slides[-1]['urls'].extend(urls)
-        else:
-            self.outside_urls.extend(urls)
-        if tag == 'style':
-            self._style_depth += 1
-        if tag not in VOID_TAGS:
-            self._tags.append(tag)
-
-    def handle_startendtag(self, tag, attrs):
-        if self._active_slides:
-            self._active_slides[-1]['urls'].extend(urls_from_attrs(attrs))
-        else:
-            self.outside_urls.extend(urls_from_attrs(attrs))
-
-    def handle_endtag(self, tag):
-        tag = tag.lower()
-        if tag == 'style' and self._style_depth:
-            self._style_depth -= 1
-        if tag == 'section' and self._sections:
-            slide = self._sections.pop()
-            if slide is not None:
-                self.slides.append(slide)
-                self._active_slides.pop()
-        if tag not in VOID_TAGS and self._tags:
-            self._tags.pop()
-
-    def handle_data(self, data):
-        if not self._style_depth:
-            return
-        self.outside_urls.extend(URL_RE.findall(data))
-
-
-def validate_logo_scope(pack_dir, html_path, asset_prefix):
-    """Return every template-logo placement that does not match the slide archetype."""
-    pack = Pack(pack_dir)
-    known_urls = asset_urls(pack, asset_prefix)
-    owners = logo_owners(pack)
-    if not known_urls:
-        return []
-
-    with open(html_path, encoding='utf-8') as stream:
-        text = stream.read()
-    parser = SlideAssetParser()
-    parser.feed(text)
-    parser.close()
-
-    problems = []
-    for url in parser.outside_urls:
-        asset_id = known_urls.get(normalized_path(url))
-        if asset_id:
-            problems.append(
-                '模板 logo %s 出现在 slide section 外，无法核验页型归属' % asset_id)
-    for number, slide in enumerate(parser.slides, 1):
-        layout = slide['layout']
-        if not layout:
-            problems.append('第 %d 页缺少 data-pptx-layout，无法核验模板 logo 归属' % number)
-            continue
-        if layout not in pack.layouts:
-            problems.append('第 %d 页声明了不存在的模板页型: %s' % (number, layout))
-            continue
-        for url in slide['urls']:
-            asset_id = known_urls.get(normalized_path(url))
-            if asset_id and layout not in owners.get(asset_id, set()):
-                allowed = '、'.join(sorted(owners.get(asset_id) or ())) or '（无）'
-                problems.append(
-                    '第 %d 页页型 %s 不得使用 %s；只允许: %s'
-                    % (number, layout, asset_id, allowed))
-    return problems
-
-
-def main(argv=None):
-    parser = argparse.ArgumentParser(
-        description='Verify that generated deck HTML places PPTX logos only on owning layouts.')
-    parser.add_argument('pack_dir')
-    parser.add_argument('html_path')
-    parser.add_argument('--asset-prefix', required=True)
-    args = parser.parse_args(argv)
-
-    problems = validate_logo_scope(args.pack_dir, args.html_path, args.asset_prefix)
-    if not problems:
-        print('PPTX_LOGO_SCOPE: PASS')
-        return 0
-    print('PPTX_LOGO_SCOPE: FAIL count=%d' % len(problems))
-    for problem in problems:
-        print('[logoScope] %s' % problem)
-    return 1
+validate_logo_scope = validate_layout_assets
 
 
 if __name__ == '__main__':