kibi-core 0.17.0 → 0.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kibi-core",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "private": false,
   "description": "Core Prolog modules and RDF graph logic for Kibi",
   "type": "module",

package/src/checks.pl

@@ -2766,7 +2766,7 @@ strict_req_fact_pairing_violation(violation(
 strict_req_fact_pairing_issue(
     ReqId,
     Description,
-    "Add a property_value fact via requires_property for the same subject_key"
+    "Add a property_value fact via requires_property for the same subject_key, or link requires_predicate to a fact_kind: predicate fact about that subject_key (its subject argument or its subject_key)"
 ) :-
     kb:current_req(ReqId),
     kb_relationship(constrains, ReqId, SubjectFactId),
@@ -2786,9 +2786,10 @@ strict_req_fact_pairing_issue(
         _ValidFrom,
         _ValidTo
     ),
+    \+ strict_req_predicate_grounds_subject(ReqId, SubjectKey),
     format(
         string(Description),
-        "Requirement constrains ~w (~w) but has no matching strict requires_property fact",
+        "Requirement constrains ~w (~w) but has no matching strict requires_property fact and no requires_predicate fact about that subject",
         [SubjectFactId, SubjectKey]
     ).
 
@@ -2870,13 +2871,46 @@ strict_req_fact_pairing_fact_kind(FactId, Kind) :-
     ;   Kind = legacy
     ).
 
+%% strict_req_predicate_grounds_subject(+ReqId, +SubjectKey)
+% A requirement that constrains a subject fact may ground its claim through
+% requires_predicate instead of requires_property (kb_model's replacementPlan
+% swaps one for the other). The predicate pairs with the subject when it is
+% about that subject_key: its own subject_key names it (kb_model sets it for
+% schemas whose arguments name no subject), or the argument its schema names
+% `subject` holds it, wherever that argument sits. A predicate without a
+% project-local schema and without subject_key keeps the catalog convention
+% of the subject as its first argument.
+% implements REQ-check-strict-pairing-predicate-grounding-v2
+strict_req_predicate_grounds_subject(ReqId, SubjectKey) :-
+    kb:effective_req_predicate(ReqId, FactId, Namespace, Name, Args, _Polarity),
+    predicate_fact_subject_key(FactId, Namespace, Name, Args, PredicateSubject),
+    PredicateSubject == SubjectKey,
+    !.
+
+%% predicate_fact_subject_key(+FactId, +Namespace, +Name, +Args, -SubjectKey)
+% The subject a predicate fact is about; at most one answer per fact.
+predicate_fact_subject_key(FactId, _Namespace, _Name, _Args, SubjectKey) :-
+    kb_entity(FactId, fact, Props),
+    memberchk(subject_key=Raw, Props),
+    !,
+    normalize_term_atom(Raw, SubjectKey).
+predicate_fact_subject_key(_FactId, Namespace, Name, Args, SubjectKey) :-
+    length(Args, Arity),
+    kb:predicate_schema(_SchemaId, Namespace, Name, Arity, ArgumentNames, _Types),
+    !,
+    nth1(Position, ArgumentNames, subject),
+    nth1(Position, Args, SubjectKey).
+predicate_fact_subject_key(_FactId, _Namespace, _Name, [SubjectKey|_], SubjectKey).
+
 strict_req_fact_pairing_kind_label(legacy, "a legacy fact without fact_kind").
 strict_req_fact_pairing_kind_label(Kind, Label) :-
     format(string(Label), "a fact_kind=~w fact", [Kind]).
 
 %% check_strict_readiness(-Violations)
 % Reports current strict-readiness levels for requirements that are still not
-% contradiction-ready. Legacy and prose-only requirements remain audit-only and
+% contradiction-ready. Each requirement has exactly one level: the first
+% strict_readiness_level/2 clause that holds, so the level is computed before
+% it is compared. Legacy and prose-only requirements remain audit-only and
 % are intentionally not treated as contradictions.
 check_strict_readiness(Violations) :-
     findall(
@@ -2902,7 +2936,8 @@ strict_readiness_issue(
     "Add a subject fact via constrains and a property_value fact via requires_property to model contradiction-safe semantics"
 ) :-
     kb_entity(ReqId, req, _),
-    strict_readiness_level(ReqId, prose_only).
+    strict_readiness_level(ReqId, Level),
+    Level == prose_only.
 
 strict_readiness_issue(
     ReqId,
@@ -2910,19 +2945,21 @@ strict_readiness_issue(
     "Replace prose or legacy fact links with a subject fact via constrains and a property_value fact via requires_property"
 ) :-
     kb_entity(ReqId, req, _),
-    strict_readiness_level(ReqId, traceable).
+    strict_readiness_level(ReqId, Level),
+    Level == traceable.
 
 strict_readiness_issue(
     ReqId,
     Description,
-    "Add a matching property_value fact via requires_property for the same subject_key"
+    "Add a matching property_value fact via requires_property for the same subject_key, or link requires_predicate to a predicate fact about that subject_key (its subject argument or its subject_key)"
 ) :-
     kb_entity(ReqId, req, _),
-    strict_readiness_level(ReqId, has_subject),
+    strict_readiness_level(ReqId, Level),
+    Level == has_subject,
     strict_readiness_primary_subject(ReqId, SubjectFactId, SubjectKey),
     format(
         string(Description),
-        "Strict readiness: not-ready (has-subject). Requirement constrains ~w (~w) but has no matching strict requires_property fact, so contradiction checks skip it.",
+        "Strict readiness: not-ready (has-subject). Requirement constrains ~w (~w) but has no matching strict requires_property fact and no requires_predicate fact about that subject, so contradiction checks skip it.",
         [SubjectFactId, SubjectKey]
     ).
 
@@ -2932,7 +2969,8 @@ strict_readiness_issue(
     "Ensure constrains and requires_property use the same subject_key, and keep the requirement current if it should participate in contradiction checks"
 ) :-
     kb_entity(ReqId, req, _),
-    strict_readiness_level(ReqId, strict_ready).
+    strict_readiness_level(ReqId, Level),
+    Level == strict_ready.
 
 strict_readiness_level(ReqId, contradiction_ready) :-
     kb:current_req(ReqId),
@@ -2951,6 +2989,11 @@ strict_readiness_level(ReqId, contradiction_ready) :-
         _ValidTo
     ),
     !.
+strict_readiness_level(ReqId, contradiction_ready) :-
+    kb:current_req(ReqId),
+    strict_readiness_primary_subject(ReqId, _SubjectFactId, SubjectKey),
+    strict_req_predicate_grounds_subject(ReqId, SubjectKey),
+    !.
 strict_readiness_level(ReqId, strict_ready) :-
     strict_readiness_has_strict_subject(ReqId),
     strict_readiness_has_strict_property(ReqId),