Preserve user toggled provenance across Rebuild Rows

app.py

@@ -555,6 +555,14 @@ def _build_toggle_rows(
         )
     )
     selected_index: Dict[str, int] = {t: i for i, t in enumerate(selected_active)}
+    selected_set: Set[str] = set(selected_active)
+
+    def _is_pipeline_preselected(tag: str) -> bool:
+        # Tags explicitly user-toggled should keep user coloring after row rebuilds.
+        # Only non-user selected tags should render as pipeline-preselected.
+        if tag not in selected_set:
+            return False
+        return _normalize_selection_origin(tag_selection_origins.get(tag, "selection")) != "user"
 
     row_defs: List[Dict[str, Any]] = []
     enabled_group_tag_sets: Dict[str, Set[str]] = {
@@ -605,7 +613,7 @@ def _build_toggle_rows(
         retrieved_other_meta = {
             t: {
                 "origin": _normalize_selection_origin(tag_selection_origins.get(t, "selection")),
-                "preselected": t in selected_active,
+                "preselected": _is_pipeline_preselected(t),
             }
             for t in merged_retrieved_other
         }
@@ -632,7 +640,7 @@ def _build_toggle_rows(
     selected_other_meta = {
         t: {
             "origin": _normalize_selection_origin(tag_selection_origins.get(t, "selection")),
-            "preselected": True,
+            "preselected": _is_pipeline_preselected(t),
         }
         for t in selected_other
     }
@@ -668,7 +676,7 @@ def _build_toggle_rows(
         tag_meta = {
             t: {
                 "origin": _normalize_selection_origin(tag_selection_origins.get(t, "selection")),
-                "preselected": t in selected_active,
+                "preselected": _is_pipeline_preselected(t),
             }
             for t in merged
         }
@@ -1010,6 +1018,7 @@ def _rebuild_rows_from_selected(
             if t and not _is_artist_tag(t) and not _is_excluded_recommendation_tag(t)
         )
     )
+    selected_active_set: Set[str] = set(selected_active)
 
     retrieved_candidate_tags: List[str] = []
     tag_selection_origins: Dict[str, str] = {}
@@ -1025,7 +1034,13 @@ def _rebuild_rows_from_selected(
             retrieved_candidate_tags.append(tn)
             if tn not in tag_selection_origins:
                 meta = row_meta.get(t, {}) if isinstance(row_meta.get(t, {}), dict) else {}
-                tag_selection_origins[tn] = _normalize_selection_origin(str(meta.get("origin", "selection")))
+                meta_origin = _normalize_selection_origin(str(meta.get("origin", "selection")))
+                meta_preselected = bool(meta.get("preselected", False))
+                # Preserve explicit user toggles across rebuild:
+                # if a currently selected tag was not pipeline-preselected, keep user provenance.
+                if tn in selected_active_set and not meta_preselected:
+                    meta_origin = "user"
+                tag_selection_origins[tn] = meta_origin
 
     for t in selected_active:
         tag_selection_origins.setdefault(t, "user")

scripts/smoke_ui_state.py

@@ -189,6 +189,42 @@ def test_toggle_then_rebuild_does_not_resurrect_removed_tag() -> None:
     _assert("cub" in prompt_after_rebuild, "other retrieved selection should remain")
 
 
+def test_rebuild_preserves_user_toggled_provenance() -> None:
+    row_defs = [
+        {
+            "name": "demo_row",
+            "label": "Demo Row",
+            "tags": ["base_tag", "manual_tag"],
+            "tag_meta": {
+                "base_tag": {"origin": "selection", "preselected": True},
+                "manual_tag": {"origin": "selection", "preselected": False},
+            },
+        }
+    ]
+    selected_state = ["base_tag", "manual_tag"]
+    row_values_state = [["base_tag", "manual_tag"]]
+    out = app._rebuild_rows_from_selected(
+        selected_state,
+        row_defs,
+        row_values_state,
+        app.display_top_groups_default,
+        app.display_top_tags_per_group_default,
+        app.display_rank_top_k_default,
+    )
+    rebuilt_rows = out[6]
+    manual_meta = None
+    for row in rebuilt_rows:
+        tags = row.get("tags", []) if isinstance(row, dict) else []
+        if "manual_tag" in tags:
+            row_meta = row.get("tag_meta", {}) if isinstance(row.get("tag_meta", {}), dict) else {}
+            manual_meta = row_meta.get("manual_tag")
+            if manual_meta:
+                break
+    _assert(manual_meta is not None, "manual_tag metadata missing after rebuild")
+    _assert(manual_meta.get("origin") == "user", "rebuild should preserve manual_tag origin as user")
+    _assert(manual_meta.get("preselected") is False, "rebuild should preserve manual_tag preselected=False")
+
+
 def test_toggle_does_not_cross_activate_unrelated_row_tag() -> None:
     row_defs = [
         {"name": "organization", "label": "Organization", "tags": ["pinup", "close-up"], "tag_meta": {}},
@@ -268,6 +304,7 @@ def main() -> None:
     test_row_deduping()
     test_rebuild_ignores_stale_selected_state()
     test_toggle_then_rebuild_does_not_resurrect_removed_tag()
+    test_rebuild_preserves_user_toggled_provenance()
     test_toggle_does_not_cross_activate_unrelated_row_tag()
     test_shared_tag_mirrors_without_unrelated_cross_toggle()
     print("ui state smoke: ok")