ui-design-workbench-cli 0.6.6__tar.gz → 0.6.7__tar.gz

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ui-design-workbench-cli
-Version: 0.6.6
+Version: 0.6.7
 Summary: Repository UI indexing, graph, preview, and deterministic review CLI
 Author: Elgreed
 Project-URL: Homepage, https://github.com/Elgreed/ui-design-workbench
@@ -131,4 +131,4 @@ A Windows `.exe` is not published yet. PyPI + `pipx` is the primary cross-platfo
 - [IR schema](references/ir-schema.md)
 - [Review workflow](references/review-workflow.md)
 
-Current CLI version: `0.6.6`.
+Current CLI version: `0.6.7`.

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/README.md

@@ -112,4 +112,4 @@ A Windows `.exe` is not published yet. PyPI + `pipx` is the primary cross-platfo
 - [IR schema](references/ir-schema.md)
 - [Review workflow](references/review-workflow.md)
 
-Current CLI version: `0.6.6`.
+Current CLI version: `0.6.7`.

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ui-design-workbench-cli"
-version = "0.6.6"
+version = "0.6.7"
 description = "Repository UI indexing, graph, preview, and deterministic review CLI"
 readme = "README.md"
 requires-python = ">=3.10"

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/scripts/fidelity_platform_adapters.py

@@ -272,7 +272,15 @@ class AndroidXmlAdapter:
             for attr, (path, group) in mapping.items():
                 if attr in attrs:
                     resolved = catalog.resolve(attrs[attr], group, normalized_style)
-                    value = resolved.value if resolved.resolved else _normalize_ref(attrs[attr], "colors" if group == "color" else group)
+                    value = _normalize_ref(str(resolved.value), "colors" if group == "color" else group) if resolved.resolved else attrs[attr]
+                    if not resolved.resolved and str(attrs[attr]).startswith(("@", "?")):
+                        result.unsupported.append({
+                            "adapter": self.id,
+                            "file": active_context.source,
+                            "line": line,
+                            "expression": f'{attr}="{attrs[attr]}"',
+                            "reason": "unresolved-android-resource",
+                        })
                     source = resolved.source or (style_entry.source if attr not in explicit_attrs and style_entry else active_context.source)
                     source_line = resolved.line if resolved.source else style_entry.line if attr not in explicit_attrs and style_entry else line
                     group_name, key = path.split(".", 1)
@@ -319,7 +327,9 @@ class AndroidXmlAdapter:
                 result.unsupported.append({"adapter": self.id, "file": active_context.source, "line": line, "expression": ", ".join(sorted(unsupported_constraints)), "reason": "unsupported-constraint-equation"})
             if attrs.get("text"):
                 resolved = catalog.resolve(attrs["text"], "string", normalized_style)
-                node["text"] = resolved.value if resolved.resolved else _normalize_ref(attrs["text"], "strings")
+                node["text"] = resolved.value if resolved.resolved else attrs["text"]
+                if not resolved.resolved and str(attrs["text"]).startswith(("@", "?")):
+                    result.unsupported.append({"adapter": self.id, "file": active_context.source, "line": line, "expression": f'text="{attrs["text"]}"', "reason": "unresolved-android-resource"})
                 node["provenance"]["text"] = property_evidence(resolved.source or active_context.source, resolved.line if resolved.source else line, f'text="{attrs["text"]}"', self.id, resolved.confidence if resolved.source else "exact")
             if attrs.get("hint"):
                 resolved = catalog.resolve(attrs["hint"], "string", normalized_style)
@@ -347,6 +357,14 @@ class AndroidXmlAdapter:
                 node["asset"] = drawable.asset or asset
                 node["style"].update(drawable.style)
                 node["provenance"]["asset"] = property_evidence(drawable.source or active_context.source, drawable.line if drawable.source else line, str(asset), self.id, drawable.confidence)
+                for key in drawable.style:
+                    node["provenance"][f"style.{key}"] = property_evidence(
+                        drawable.source or active_context.source,
+                        drawable.line if drawable.source else line,
+                        str(asset),
+                        self.id,
+                        drawable.confidence,
+                    )
                 if not drawable.asset:
                     result.unsupported.append({"adapter": self.id, "file": active_context.source, "line": line, "expression": asset, "reason": "unsupported-android-drawable"})
             scale_types = {"centerCrop": "cover", "fitCenter": "contain", "centerInside": "contain", "fitXY": "fill", "center": "none"}
@@ -361,7 +379,13 @@ class AndroidXmlAdapter:
                     "type": "icon", "component": "ImageButton.drawable", "asset": node["asset"], "alt": node.get("alt", ""),
                     "layout": {"width": "fill", "height": "fill"}, "style": {"objectFit": node.get("style", {}).get("objectFit", "contain")}, "children": [],
                     "source": {"file": active_context.source, "line": line}, "confidence": node.get("confidence", "high"), "standardRef": node.get("standardRef"),
-                    "provenance": {"asset": node["provenance"].get("asset", property_evidence(active_context.source, line, str(node["asset"]), self.id, "exact"))},
+                    "provenance": {
+                        "component": property_evidence(active_context.source, line, "ImageButton drawable", self.id, "high"),
+                        "asset": node["provenance"].get("asset", property_evidence(active_context.source, line, str(node["asset"]), self.id, "exact")),
+                        "layout.width": property_evidence(active_context.source, line, "ImageButton drawable bounds", self.id, "high"),
+                        "layout.height": property_evidence(active_context.source, line, "ImageButton drawable bounds", self.id, "high"),
+                        "style.objectFit": node["provenance"].get("style.objectFit", property_evidence(active_context.source, line, "ImageButton drawable scale", self.id, "high")),
+                    },
                 }
                 node["children"].insert(0, icon_id)
             if node.get("layout", {}).get("direction") == "overlay":

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/scripts/render_preview.py

@@ -676,11 +676,15 @@ def fidelity_audit(ir: dict[str, Any]) -> dict[str, Any]:
     excluded_routes, invalid_route_exclusions = exclusion_keys(fidelity.get("excludedRoutes", []), "route")
     discovered_screens = ir.get("discoveredScreens", [])
     discovered_routes = ir.get("discoveredRoutes", [])
-    translated_screen_keys = {
-        str(screen.get("discoveredKey") or f'{screen.get("source", {}).get("file", "")}#{screen.get("source", {}).get("symbol", screen.get("name", ""))}')
-        for screen in screens
-        if screen.get("translationStatus") != "inventory"
-    }
+    translated_screen_keys: set[str] = set()
+    for screen in screens:
+        if screen.get("translationStatus") == "inventory":
+            continue
+        translated_screen_keys.add(str(
+            screen.get("discoveredKey")
+            or f'{screen.get("source", {}).get("file", "")}#{screen.get("source", {}).get("symbol", screen.get("name", ""))}'
+        ))
+        translated_screen_keys.update(str(key) for key in screen.get("discoveredKeys", []) if key)
     expected_screen_keys = {f'{screen.get("file", "")}#{screen.get("name", "")}' for screen in discovered_screens}
     missing_screen_keys = sorted(expected_screen_keys - translated_screen_keys - excluded_screens)
     translated_routes = {

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/scripts/scan_ui.py

@@ -1022,6 +1022,26 @@ def evidence_for_screen(screen: dict[str, Any], discovered: list[dict[str, Any]]
     source_file = str(screen.get("source", {}).get("file") or "")
     fragment = str(screen.get("fragment") or "")
     symbol = str(screen.get("source", {}).get("symbol") or screen.get("name") or "")
+    discovered_key = str(screen.get("discoveredKey") or "")
+    navigation_file = str(screen.get("navigationSource", {}).get("file") or "")
+    if discovered_key:
+        matched = next((
+            candidate for candidate in discovered
+            if f'{candidate.get("file", "")}#{candidate.get("name", "")}' == discovered_key
+        ), None)
+        if matched:
+            return matched
+    if fragment:
+        fragment_matches = [
+            candidate for candidate in discovered
+            if str(candidate.get("fragment") or "") == fragment
+        ]
+        if navigation_file:
+            matched = next((candidate for candidate in fragment_matches if str(candidate.get("file") or "") == navigation_file), None)
+            if matched:
+                return matched
+        if len(fragment_matches) == 1:
+            return fragment_matches[0]
     return next((
         candidate for candidate in discovered
         if str(candidate.get("file") or candidate.get("source", {}).get("file") or "") == source_file
@@ -1032,6 +1052,39 @@ def evidence_for_screen(screen: dict[str, Any], discovered: list[dict[str, Any]]
     ), {})
 
 
+def consolidate_translated_android_variants(translated_screens: list[dict[str, Any]]) -> None:
+    """Keep one canonical screen per Android layout while retaining qualifier evidence."""
+    grouped: dict[str, list[dict[str, Any]]] = {}
+    for screen in translated_screens:
+        if screen.get("platform") != "android" or not screen.get("androidLayout"):
+            continue
+        key = str(screen.get("id") or screen.get("androidLayout"))
+        grouped.setdefault(key, []).append(screen)
+
+    consolidated: list[dict[str, Any]] = []
+    emitted: set[str] = set()
+    for screen in translated_screens:
+        if screen.get("platform") != "android" or not screen.get("androidLayout"):
+            consolidated.append(screen)
+            continue
+        key = str(screen.get("id") or screen.get("androidLayout"))
+        if key in emitted:
+            continue
+        emitted.add(key)
+        variants = grouped[key]
+        canonical = next((item for item in variants if not item.get("resourceQualifier")), variants[-1])
+        if len(variants) > 1:
+            canonical["resourceVariants"] = [
+                {
+                    "qualifier": str(item.get("resourceQualifier") or "default"),
+                    "source": dict(item.get("source", {})),
+                }
+                for item in variants
+            ]
+        consolidated.append(canonical)
+    translated_screens[:] = consolidated
+
+
 def reconcile_translated_android_screens(
     translated_screens: list[dict[str, Any]],
     discovered: list[dict[str, Any]],
@@ -1313,6 +1366,7 @@ def starter_ir(scan_result: dict[str, Any]) -> dict[str, Any]:
         for context in adapter_contexts
     ]
     translated = translate_sources(adapter_contexts)
+    consolidate_translated_android_variants(translated.screens)
     resolve_translated_android_includes(translated)
     token_resolver = TokenResolver(translated.tokens)
     for node in translated.nodes.values():
@@ -1325,6 +1379,16 @@ def starter_ir(scan_result: dict[str, Any]) -> dict[str, Any]:
     raw_scan_screens = scan_result.get("screens", [])
     reconcile_translated_android_screens(translated.screens, raw_scan_screens)
     reconcile_translated_screens(translated.screens, raw_scan_screens)
+    for screen in translated.screens:
+        variant_keys = []
+        for variant in screen.get("resourceVariants", []):
+            variant_file = str(variant.get("source", {}).get("file") or "")
+            candidate = next((item for item in raw_scan_screens if str(item.get("file") or "") == variant_file), None)
+            if candidate:
+                variant_keys.append(f'{candidate.get("file", "")}#{candidate.get("name", "")}')
+        keys = [str(screen.get("discoveredKey") or ""), *variant_keys]
+        if any(keys):
+            screen["discoveredKeys"] = list(dict.fromkeys(key for key in keys if key))
     if scan_result.get("primaryPlatforms") == ["flutter"]:
         discovered_flutter = {str(item.get("name") or "") for item in raw_scan_screens}
         translated.screens[:] = [
@@ -1447,9 +1511,15 @@ def starter_ir(scan_result: dict[str, Any]) -> dict[str, Any]:
             for item in screens
         }
         represented_discovered = {str(item.get("discoveredKey") or "") for item in screens if item.get("discoveredKey")}
+        represented_variant_files = {
+            str(variant.get("source", {}).get("file") or "")
+            for item in screens
+            for variant in item.get("resourceVariants", [])
+            if isinstance(variant, dict)
+        }
         for inventory in inventory_screens:
             key = (str(inventory.get("source", {}).get("file") or ""), str(inventory.get("fragment") or ""))
-            if key in represented or str(inventory.get("discoveredKey") or "") in represented_discovered:
+            if key[0] in represented_variant_files or key in represented or str(inventory.get("discoveredKey") or "") in represented_discovered:
                 continue
             screens.append(inventory)
             stack = [str(inventory.get("root") or "")]

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/scripts/ui_design_workbench_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ui-design-workbench-cli
-Version: 0.6.6
+Version: 0.6.7
 Summary: Repository UI indexing, graph, preview, and deterministic review CLI
 Author: Elgreed
 Project-URL: Homepage, https://github.com/Elgreed/ui-design-workbench
@@ -131,4 +131,4 @@ A Windows `.exe` is not published yet. PyPI + `pipx` is the primary cross-platfo
 - [IR schema](references/ir-schema.md)
 - [Review workflow](references/review-workflow.md)
 
-Current CLI version: `0.6.6`.
+Current CLI version: `0.6.7`.

{ui_design_workbench_cli-0.6.6 → ui_design_workbench_cli-0.6.7}/scripts/uidw.py

@@ -53,7 +53,7 @@ from scan_ui import (
 
 
 CACHE_VERSION = 8
-CLI_VERSION = "0.6.6"
+CLI_VERSION = "0.6.7"
 CONFIG_VERSION = 5
 STATE_DIR_NAME = ".ui-design-workbench"
 CONFIG_NAME = "config.json"
@@ -1036,6 +1036,24 @@ def prune_missing_token_refs(value: Any, tokens: dict[str, Any]) -> Any:
     return copy.deepcopy(value)
 
 
+def prune_orphan_provenance(node: dict[str, Any]) -> dict[str, Any]:
+    """Remove evidence entries for authored properties pruned during cache migration."""
+    provenance = node.get("provenance")
+    if not isinstance(provenance, dict):
+        return node
+
+    def path_exists(path: str) -> bool:
+        current: Any = node
+        for part in path.split("."):
+            if not isinstance(current, dict) or part not in current:
+                return False
+            current = current[part]
+        return True
+
+    node["provenance"] = {path: evidence for path, evidence in provenance.items() if path_exists(str(path))}
+    return node
+
+
 def merge_authored_state(
     generated: dict[str, Any],
     design_model: dict[str, Any],
@@ -1074,6 +1092,7 @@ def merge_authored_state(
         cleaned_authored = prune_missing_token_refs(authored, merged_tokens)
         if not isinstance(cleaned_authored, dict):
             continue
+        prune_orphan_provenance(cleaned_authored)
         existing = result.setdefault("nodes", {}).get(node_id, {})
         merged = copy.deepcopy(existing)
         for key, value in cleaned_authored.items():
@@ -1085,6 +1104,7 @@ def merge_authored_state(
             merged["sourceState"] = "stale"
         else:
             merged.pop("sourceState", None)
+        prune_orphan_provenance(merged)
         result["nodes"][node_id] = merged
 
     fixtures = design_model.get("scenarioFixtures", {})