[FIX] tab2: new resource batches now cover named standard resources, not only hidden "Other" ones

tabs/tab2_constraints.py

@@ -44,8 +44,11 @@ def get_hidden_resources_for_method(m, method_to_primary_resources, cost_sliders
 def get_all_missing_required(m, cost_sliders_norm):
     """Return all required resources for method m that are not yet available.
 
-    Standard resource: available if resource_caps.get(r, 0.0) > 0.
-    Hidden resource: available if any custom batch with group == r is assigned to m.
+    A resource (standard or hidden) is available if resource_caps.get(r, 0.0) > 0
+    OR if a custom batch with group == r is assigned to m — a custom batch
+    substitutes for its reference resource regardless of whether that resource
+    is a generic "Other X" (hidden) one or a specifically named standard one
+    (e.g. a "Basalt A" batch referencing "Basalt mineral").
     Secondary resources and resources with median <= 0 are excluded.
 
     Returns:
@@ -53,7 +56,7 @@ def get_all_missing_required(m, cost_sliders_norm):
     """
     resource_caps = st.session_state.get("resource_caps", {})
     custom_resources = st.session_state.get("custom_resources", [])
-    covered_hidden = {
+    covered_by_batch = {
         b["group"] for b in custom_resources
         if m in b.get("methods", {})
     }
@@ -63,12 +66,10 @@ def get_all_missing_required(m, cost_sliders_norm):
             continue
         if coeff_dict.get("median", 0.0) <= 0:
             continue
-        if r in hidden_resource_names:
-            if r not in covered_hidden:
-                missing.append(r)
-        else:
-            if resource_caps.get(r, 0.0) <= 0:
-                missing.append(r)
+        if r in covered_by_batch:
+            continue
+        if resource_caps.get(r, 0.0) <= 0:
+            missing.append(r)
     return missing
 
 
@@ -120,11 +121,13 @@ def _render_resource_status(m, cost_sliders_norm):
     """
     resource_caps   = st.session_state.get("resource_caps", {})
     custom_resources = st.session_state.get("custom_resources", [])
-    # Map hidden resource group → list of batch names covering it for method m.
-    covered_hidden: dict[str, list[str]] = {}
+    # Map resource group → list of batch names covering it for method m (any
+    # named standard resource or hidden "Other X" resource can be substituted
+    # by a custom batch referencing it).
+    covered_by_batch: dict[str, list[str]] = {}
     for b in custom_resources:
         if m in b.get("methods", {}):
-            covered_hidden.setdefault(b["group"], []).append(b["name"])
+            covered_by_batch.setdefault(b["group"], []).append(b["name"])
 
     all_res = cost_sliders_norm.get(m, {})
     required_rows = []
@@ -133,15 +136,15 @@ def _render_resource_status(m, cost_sliders_norm):
     for r, coeff_dict in all_res.items():
         if coeff_dict.get("median", 0.0) <= 0:
             continue
+        batch_names = covered_by_batch.get(r)
         if r in hidden_resource_names:
-            batch_names = covered_hidden.get(r)
             available = bool(batch_names)
             # Show actual batch name(s) instead of the generic "Other X" group
             display_r = ", ".join(batch_names) if batch_names else r
             source = "Add as new resource in Resource inputs"
         else:
-            available = resource_caps.get(r, 0.0) > 0
-            display_r = r
+            available = resource_caps.get(r, 0.0) > 0 or bool(batch_names)
+            display_r = ", ".join(batch_names) if (not resource_caps.get(r, 0.0) > 0 and batch_names) else r
             source = "Set quantity in Resource inputs"
 
         icon = "✅" if available else "❌"