Fix tag source color mapping and add UI color smoke checks

app.py

@@ -749,13 +749,25 @@ def _build_tooltip_payload(row_defs: List[Dict[str, Any]], max_rows: int) -> str
     row_defs_ui = (row_defs or [])[: max(0, int(max_rows))]
     tips: Dict[str, str] = {}
     rows: List[List[str]] = []
+    meta_rows: List[List[Dict[str, Any]]] = []
     for row in row_defs_ui:
         tags = _dedupe_norm_tags(row.get("tags", []) if isinstance(row, dict) else [])
         rows.append(tags)
+        row_meta = row.get("tag_meta", {}) if isinstance(row, dict) and isinstance(row.get("tag_meta", {}), dict) else {}
+        meta_row: List[Dict[str, Any]] = []
+        for t in tags:
+            raw_meta = row_meta.get(t, {}) if isinstance(row_meta.get(t, {}), dict) else {}
+            meta_row.append(
+                {
+                    "origin": _normalize_selection_origin(str(raw_meta.get("origin", "selection"))),
+                    "preselected": bool(raw_meta.get("preselected", False)),
+                }
+            )
+        meta_rows.append(meta_row)
         for t in tags:
             if t not in tips:
                 tips[t] = _tooltip_text_for_tag(t)
-    return json.dumps({"rows": rows, "tips": tips}, ensure_ascii=True)
+    return json.dumps({"rows": rows, "meta_rows": meta_rows, "tips": tips}, ensure_ascii=True)
 
 
 def _build_row_component_updates(
@@ -1621,32 +1633,48 @@ client_js = """
 
   const readTooltipMap = () => {
     const el = document.querySelector("#psq-tooltip-map textarea, #psq-tooltip-map input");
-    if (!el) return { rows: [], tips: {} };
+    if (!el) return { rows: [], meta_rows: [], tips: {} };
     const raw = (el.value || "").trim();
-    if (!raw) return { rows: [], tips: {} };
+    if (!raw) return { rows: [], meta_rows: [], tips: {} };
     try {
       const obj = JSON.parse(raw);
-      if (!obj || typeof obj !== "object") return { rows: [], tips: {} };
+      if (!obj || typeof obj !== "object") return { rows: [], meta_rows: [], tips: {} };
       const rows = Array.isArray(obj.rows) ? obj.rows : [];
+      const meta_rows = Array.isArray(obj.meta_rows) ? obj.meta_rows : [];
       const tips = (obj.tips && typeof obj.tips === "object") ? obj.tips : {};
-      return { rows, tips };
+      return { rows, meta_rows, tips };
     } catch (_) {
-      return { rows: [], tips: {} };
+      return { rows: [], meta_rows: [], tips: {} };
     }
   };
 
   const applyTooltips = () => {
     const payload = readTooltipMap();
     const rowTags = Array.isArray(payload.rows) ? payload.rows : [];
+    const rowMeta = Array.isArray(payload.meta_rows) ? payload.meta_rows : [];
     const tipMap = (payload.tips && typeof payload.tips === "object") ? payload.tips : {};
+    const validOrigins = new Set(["rewrite", "selection", "probe", "structural", "implied", "user"]);
     const rowEls = document.querySelectorAll(".lego-tags");
     rowEls.forEach((rowEl, rowIdx) => {
       const tags = Array.isArray(rowTags[rowIdx]) ? rowTags[rowIdx] : [];
+      const metas = Array.isArray(rowMeta[rowIdx]) ? rowMeta[rowIdx] : [];
       const labels = rowEl.querySelectorAll("label");
       labels.forEach((label, tagIdx) => {
         const span = label.querySelector("span");
         const tag = (tagIdx < tags.length) ? tags[tagIdx] : "";
         const tip = tag && Object.prototype.hasOwnProperty.call(tipMap, tag) ? (tipMap[tag] || "") : "";
+        const meta = (tagIdx < metas.length && metas[tagIdx] && typeof metas[tagIdx] === "object")
+          ? metas[tagIdx]
+          : {};
+        const originRaw = String(meta.origin || "selection").trim().toLowerCase();
+        const origin = validOrigins.has(originRaw) ? originRaw : "selection";
+        const preselected = !!meta.preselected;
+        label.setAttribute("data-psq-origin", origin);
+        label.setAttribute("data-psq-preselected", preselected ? "1" : "0");
+        if (span) {
+          span.setAttribute("data-psq-origin", origin);
+          span.setAttribute("data-psq-preselected", preselected ? "1" : "0");
+        }
         if (tip) {
           label.title = tip;
           if (span) span.title = tip;

scripts/smoke_ui_state.py

@@ -1,4 +1,6 @@
 import sys
+import re
+import json
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
@@ -10,6 +12,82 @@ def _assert(cond: bool, msg: str) -> None:
         raise AssertionError(msg)
 
 
+def _css_block(selector: str) -> str:
+    pat = re.compile(rf"{re.escape(selector)}\s*\{{([^}}]+)\}}", re.DOTALL)
+    m = pat.search(app.css)
+    _assert(m is not None, f"missing CSS selector block: {selector}")
+    return m.group(1)
+
+
+def _css_prop(block: str, prop: str) -> str:
+    pat = re.compile(rf"{re.escape(prop)}\s*:\s*([^;]+);", re.IGNORECASE)
+    m = pat.search(block)
+    _assert(m is not None, f"missing CSS property '{prop}' in block: {block}")
+    return m.group(1).strip().lower()
+
+
+def test_toggle_color_contract_matches_legend() -> None:
+    legend_bg_by_origin = {
+        "rewrite": _css_prop(_css_block(".source-legend .chip.rewrite"), "background"),
+        "selection": _css_prop(_css_block(".source-legend .chip.selection"), "background"),
+        "probe": _css_prop(_css_block(".source-legend .chip.probe"), "background"),
+        "structural": _css_prop(_css_block(".source-legend .chip.structural"), "background"),
+        "implied": _css_prop(_css_block(".source-legend .chip.implied"), "background"),
+        "user": _css_prop(_css_block(".source-legend .chip.user"), "background"),
+    }
+
+    on_bg2_by_origin = {
+        "rewrite": _css_prop(_css_block('.lego-tags label[data-psq-preselected="1"][data-psq-origin="rewrite"] span'), "--on-bg2"),
+        "selection": _css_prop(_css_block('.lego-tags label[data-psq-preselected="1"][data-psq-origin="selection"] span'), "--on-bg2"),
+        "probe": _css_prop(_css_block('.lego-tags label[data-psq-preselected="1"][data-psq-origin="probe"] span'), "--on-bg2"),
+        "structural": _css_prop(_css_block('.lego-tags label[data-psq-preselected="1"][data-psq-origin="structural"] span'), "--on-bg2"),
+        "implied": _css_prop(_css_block('.lego-tags label[data-psq-preselected="1"][data-psq-origin="implied"] span'), "--on-bg2"),
+        "user": _css_prop(_css_block('.lego-tags label[data-psq-preselected="0"] span'), "--on-bg2"),
+    }
+
+    for origin, legend_bg in legend_bg_by_origin.items():
+        _assert(
+            on_bg2_by_origin[origin] == legend_bg,
+            f"legend/toggle color mismatch for '{origin}': toggle={on_bg2_by_origin[origin]} legend={legend_bg}",
+        )
+
+
+def test_client_js_stamps_source_color_attributes() -> None:
+    js = app.client_js
+    has_origin_attr = ("data-psq-origin" in js) or ("dataset.psqOrigin" in js)
+    has_preselected_attr = ("data-psq-preselected" in js) or ("dataset.psqPreselected" in js)
+    _assert(has_origin_attr, "client_js does not stamp per-tag origin attributes on checkbox labels")
+    _assert(has_preselected_attr, "client_js does not stamp per-tag preselected attributes on checkbox labels")
+
+
+def test_tooltip_payload_includes_row_meta_for_color_mapping() -> None:
+    row_defs = [
+        {
+            "name": "r1",
+            "label": "R1",
+            "tags": ["solo", "female"],
+            "tag_meta": {
+                "solo": {"origin": "rewrite", "preselected": True},
+                "female": {"origin": "selection", "preselected": False},
+            },
+        }
+    ]
+    raw = app._build_tooltip_payload(row_defs, max_rows=app.display_max_rows_default)
+    payload = json.loads(raw)
+    _assert("meta_rows" in payload, "tooltip payload missing meta_rows")
+    _assert(isinstance(payload["meta_rows"], list), "tooltip payload meta_rows must be a list")
+    _assert(len(payload["meta_rows"]) == 1, "meta_rows should align with visible row count")
+    _assert(isinstance(payload["meta_rows"][0], list), "meta_rows row must be a list")
+    _assert(len(payload["meta_rows"][0]) == 2, "meta_rows tag metadata count must align with tags")
+
+    first = payload["meta_rows"][0][0]
+    second = payload["meta_rows"][0][1]
+    _assert(first.get("origin") == "rewrite", "first tag origin metadata mismatch")
+    _assert(first.get("preselected") is True, "first tag preselected metadata mismatch")
+    _assert(second.get("origin") == "selection", "second tag origin metadata mismatch")
+    _assert(second.get("preselected") is False, "second tag preselected metadata mismatch")
+
+
 def test_prompt_uses_visible_rows_only() -> None:
     # If selected state contains stale hidden tags, prompt should still reflect visible-row selections only.
     row_defs = [
@@ -183,6 +261,9 @@ def test_shared_tag_mirrors_without_unrelated_cross_toggle() -> None:
 
 
 def main() -> None:
+    test_toggle_color_contract_matches_legend()
+    test_client_js_stamps_source_color_attributes()
+    test_tooltip_payload_includes_row_meta_for_color_mapping()
     test_prompt_uses_visible_rows_only()
     test_row_deduping()
     test_rebuild_ignores_stale_selected_state()