fix: fold membership is PRIVATE separation; close NOTELEPORT (sink cost ledger EMPTY)

Three Java-cited fixes, sink cost ledger 3 -> 0:

- CustomPower parent folds: drop the ad-hoc 'not is_vpp(parent)' skip and
  skip PRIVATE modifiers instead, as engine/cost.py already does. Java's
  List.separatePrivateMods (List.java:53-60) removes private modifiers
  from getAssignedModifiers() at restore, so no fold ever sees them --
  that separation, not any parent-hop difference, is why Ultrasonique's
  pool (commons PRIVATE="Yes") folds nothing while Yin Wu's folds.
  Proved with a temporary --probe-child oracle mode: HD's pool showed
  assignedMods=0 at runtime.
- HDCLoader: absent PRIVATE falls back to the types-based default
  (Modifier.java:1136-1147 -- framework-typed means private).
- Modifier.total_value reads the MINVAL-clamped levels property, as
  Java getTotalValue() calls getLevels() (GenericObject.java:1996-2002);
  and _template_data no longer defaults an absent MINVAL to 1 (_i's
  default is 1; MINVAL's is 0) -- the two together close NOTELEPORT
  (+1/4 from the level floor; CannotEscapeWithTeleport already zeroes
  the stated BASECOST at restore, CannotEscapeWithTeleport.java:127-131).

Suite 1724 passed; corpus parity unchanged; stateful ledger 0, prototype 1.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PrVDXgpDfQpzEGErZTLjEs

Author: pdbethke

kirby_cost/io/hdc_loader.py

@@ -1849,6 +1849,13 @@ def _build_modifier(self, elem, parent: GenericObject) -> Optional[Modifier]:
             mod.private_mod = True
         elif private_str.upper().startswith("N"):
             mod.private_mod = False
+        else:
+            # Modifier.restoreFromSave (Modifier.java:1136-1147): no PRIVATE
+            # attribute falls back to the types-based default -- a modifier
+            # typed for a framework is private to it. HD always writes the
+            # attribute back out, so this only fires for hand-authored XML.
+            mod.private_mod = bool(
+                {"VPP", "MP", "EC", "LIST"} & set(mod.types or ()))
 
         # Load sub-modifiers (modifiers on modifiers)
         for sub_elem in elem.findall("MODIFIER"):

kirby_cost/objects/modifier.py

@@ -135,9 +135,13 @@ def total_value(self) -> float:
             # Use getDoubleTotal() for modifier calculations
             total += adder.double_total()
 
-        # Add level costs
+        # Add level costs. Java reads getLevels() -- the MINVAL-clamped
+        # accessor -- not the raw field (Modifier.getTotalValue), so a stated
+        # LEVELS below the template's MINVAL still prices at the floor:
+        # NOTELEPORT (MINVAL=1, LVLCOST=.25) is +1/4 even when the document
+        # writes no LEVELS at all.
         if self._level_value > 0.0:
-            level_units = float(self._levels) / self._level_value
+            level_units = float(self.levels) / self._level_value
             total += level_units * self._level_cost
 
         # Apply advantages (positive nested modifiers)

kirby_cost/objects/powers/custom_power.py

@@ -10,7 +10,7 @@
 from kirby_cost.objects.powers.power import Power
 from kirby_cost.objects.base import GenericObject
 from kirby_cost.util.rounder import round_half_down, round_up
-from kirby_cost.objects.frameworks import is_multipower, is_elemental_control, is_vpp
+from kirby_cost.objects.frameworks import is_multipower, is_elemental_control
 from kirby_cost.objects.modifiers.linked import is_linked
 from typing import Optional
 
@@ -155,6 +155,12 @@ def _compute_active_cost(self, exclude_xmlid: str = None) -> float:
             parent = self.main_power.parent
         if parent:
             for mod in parent.assigned_modifiers:
+                # Private modifiers belong to the pool alone -- HD's List
+                # removed them from getAssignedModifiers() at restore
+                # (List.separatePrivateMods); this engine keeps one list, so
+                # the skip is explicit, as in engine/cost.py.
+                if getattr(mod, "private", False):
+                    continue
                 if mod.types and "VPP" in mod.types:
                     continue
                 if mod.xmlid == "CHARGES" and is_multipower(parent):
@@ -198,8 +204,17 @@ def real_cost_pre_list(self) -> float:
         parent = self._parent
         if self.main_power:
             parent = self.main_power.parent
-        if parent and not is_vpp(parent):
+        # Java folds the parent List's limitations for VPP children too --
+        # CustomPower.getRealCostPreList has no parent-type check. What keeps a
+        # pool like Ultrasonique's from folding is that its commons are
+        # PRIVATE="Yes": List.separatePrivateMods (List.java:53-60) moves
+        # private modifiers OUT of getAssignedModifiers() at restore, so the
+        # fold never sees them. This engine keeps both kinds in one list, so
+        # the skip is explicit, as in engine/cost.py.
+        if parent:
             for mod in parent.assigned_modifiers:
+                if getattr(mod, "private", False):
+                    continue
                 if mod.types and "VPP" in mod.types:
                     continue
                 if mod.xmlid == "CHARGES" and is_multipower(self._parent):
@@ -216,10 +231,12 @@ def real_cost_pre_list(self) -> float:
         if has_limitations:
             real_cost = round_half_down(real_cost)
 
-        # Minimum 1 CP
+        # Minimum 1 CP -- Java's condition sees the COMPUTED getLevels()
+        # (roundUp(baseCost), CustomPower.java:205-206 and :246-250), so a
+        # stated LEVELS with baseCost 0 stays 0 and the floor does not fire.
         if (real_cost < 1.0 and
             (d > 0.0 or
-             (self._levels > 0 and len(self.assigned_adders) == 0 and
+             (self.levels > 0 and len(self.assigned_adders) == 0 and
               self.base_cost >= 0.0))):
             real_cost = 1.0
 

kirby_cost/template/hdt_provider.py

@@ -312,7 +312,7 @@ def _template_data(entry: dict[str, Any], *, is_power: bool) -> TemplateData:
         level_cost=level_cost,
         level_value=level_value,
         level_power=_i(a, "LVLPOWER"),
-        min_val=_i(a, "MINVAL"),
+        min_val=_i(a, "MINVAL", 0),
         level_multiplier=_i(a, "LVLMULTIPLIER"),
         level_start=_i(a, "LEVELSTART"),
         continuing_effect=(a.get("CONTINUINGEFFECT") or "").upper().startswith("Y"),

tests/fixtures/validation_sink_cost_gaps.json

@@ -1,9 +1,5 @@
 {
   "_comment": "Shrink-only ledger for tests/test_validation_sink_costs.py. Regenerate the fixture: venv/bin/python -c 'from tests.validation_sink import write; write(\"/tmp/ValidationSink.hdc\")' ; (cd ../kirby-hd-oracle && ./hd6cli.sh /tmp/ValidationSink.hdc) > tests/fixtures/authored/ValidationSink.json. Seeded 2026-08-30: the corpus is HD-written and cannot see these; the hand-written sink can.",
-  "_baseline": "23 sink cost values disagree with HD (2026-08-30); option-cost fix 2026-08-30: 13 closed, now 10 remain; 5E-fallback ruling + MULTIPLESFX state 2026-08-30: 5 closed, 5 new, now 10; REQUIRED-adder attach 2026-08-31: 2 closed (DoT), now 8; 2026-08-31 session: Images/DoT/VPP-slot cells closed (option sentinels, REQUIRED adders, shared-path fold); CustomPower fold membership reverted (corpus trade), now 3",
-  "gaps": {
-    "20260830000060:active_cost": "NakedModifier + NOTELEPORT: the template's MINVAL=1/LVLCOST=.25 now reaches TemplateData (min_val plumbed 2026-08-31) and Modifier.levels clamps on it, but the LOADED modifier still reports value 0 -- the remaining gap is in the naked-advantage path (NakedModifier sums only PRIVATE advantages; check isPrivate classification for a stated modifier) -- HD 15.0 engine 10 (NAKEDMODIFIER 'Naked Advantage')",
-    "20260830000060:real_cost": "NakedModifier + NOTELEPORT: the template's MINVAL=1/LVLCOST=.25 now reaches TemplateData (min_val plumbed 2026-08-31) and Modifier.levels clamps on it, but the LOADED modifier still reports value 0 -- the remaining gap is in the naked-advantage path (NakedModifier sums only PRIVATE advantages; check isPrivate classification for a stated modifier) -- HD 15.0 engine 10 (NAKEDMODIFIER 'Naked Advantage')",
-    "20260830000061:real_cost": "CustomPower real-cost: the engine's min-1 reads raw _levels (stated 5) where Java's condition sees computed getLevels()==roundUp(baseCost)==0 (CustomPower.java:246-250); the fix rode with the parent-fold membership change that traded ULTRASONIQUE for DOCTOR_YIN_WU and was reverted -- CustomPower.getRealCostPreList folds only the parentID-based getParentList(), never the transient parent CompoundPower sets while summing; needs a membership-based port -- HD 0.0 engine 1.0 (CUSTOMPOWER 'Custom Power With END')"
-  }
-}
+  "_baseline": "23 sink cost values disagree with HD (2026-08-30); option-cost fix 2026-08-30: 13 closed, now 10 remain; 5E-fallback ruling + MULTIPLESFX state 2026-08-30: 5 closed, 5 new, now 10; REQUIRED-adder attach 2026-08-31: 2 closed (DoT), now 8; 2026-08-31 session: Images/DoT/VPP-slot cells closed (option sentinels, REQUIRED adders, shared-path fold); CustomPower fold membership reverted (corpus trade), now 3; fold-membership port 2026-08-31 (PRIVATE separation is the mechanism -- List.separatePrivateMods -- not a parent-hop difference): CustomPower cell closed, now 2; NOTELEPORT close 2026-08-31 (CannotEscapeWithTeleport zeroes stated BASECOST at restore -- already ported; the real gaps were total_value reading raw _levels where Java getTotalValue calls the MINVAL-clamped getLevels(), and _i defaulting an absent MINVAL to 1 instead of 0): now 0 -- EMPTY, the ledger's job is to stay that way",
+  "gaps": {}
+}