@pareto4/pp-core 1.19.0 → 1.21.0

package/pp-core/bin/lib/capability-state.cjs

@@ -21,7 +21,7 @@
  * Dependencies (leaf modules only — no circular risk):
  *   - node:path
  *   - ./io.cjs                 (output, error)
- *   - ./capability-activation.cjs (_resolveActivationValue)
+ *   - ./capability-activation.cjs (_resolveActivationValue, evaluateWhen)
  *   - ./install-profiles.cjs   (readActiveProfile, loadSkillsManifest, resolveProfile)
  *   - ./surface.cjs            (resolveSurface)
  *   - ./config-loader.cjs      (loadConfig)
@@ -39,7 +39,7 @@ const ioMod = require("./io.cjs");
 const { output: coreOutput, error: coreError } = ioMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const activationMod = require("./capability-activation.cjs");
-const { _resolveActivationValue } = activationMod;
+const { _resolveActivationValue, evaluateWhen } = activationMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const configLoaderMod = require("./config-loader.cjs");
 const { loadConfig } = configLoaderMod;
@@ -269,9 +269,9 @@ function resolveCapabilityState(input) {
         const active = baseActive && requiresGateOpen;
         // ── hooks ──────────────────────────────────────────────────────────────────
         // Collect from steps, gates, contributions. Each may have a `when` key.
-        // Activation semantics (mirrors loop-resolver.isActive exactly):
+        // Activation semantics (shared with loop-resolver.isActive through evaluateWhen):
         //   - No `when` field present (undefined/null) → unconditional, active=true
-        //   - Non-empty string `when` → resolve via _resolveActivationValue
+        //   - Non-empty string `when` → every `&&` conjunct must hold
         //   - Present-but-empty-string or non-string `when` → malformed, active=false
         // The original `when` value is carried through to the output for visibility.
         const hooks = [];
@@ -283,20 +283,10 @@ function resolveCapabilityState(input) {
                 const point = typeof h['point'] === 'string' ? h['point'] : '';
                 // Carry the raw `when` value through for visibility
                 const whenRaw = h['when'];
-                let configured;
-                if (whenRaw === undefined || whenRaw === null) {
-                    // No `when` field → unconditional, always active
-                    configured = true;
-                }
-                else if (typeof whenRaw === 'string' && whenRaw.length > 0) {
-                    // Non-empty string `when` → resolve via _resolveActivationValue
-                    configured = _resolveActivationValue(whenRaw, config, cwd, registry);
-                }
-                else {
-                    // Present-but-empty-string or non-string `when` → malformed, inactive
-                    // (mirrors loop-resolver.isActive: `typeof when !== 'string' || when.length === 0` → false)
-                    configured = false;
-                }
+                // One shared evaluator (Phase 37 D-14), called WITHOUT a ceremony thunk so
+                // this report is unchanged: it answers for the config switch, never for a
+                // phase verdict, and a `ceremony.<gate>` conjunct counts as open here.
+                const configured = evaluateWhen(whenRaw, { config, cwd, registry });
                 // Hook active = capability-level active AND hook's own config gate.
                 // The capability's `active` constant (= enabled && configActivation) is
                 // used here so that a config-disabled capability (active=false) cannot