eyeling 1.22.6 → 1.22.8

package/eyeling.js

@@ -2354,6 +2354,23 @@ function __logNaturalPriorityFromTerm(t) {
 // ===========================================================================
 // Backward proof & builtins mutual recursion — declarations first
 
+function __varCameFromBoundSubstitution(goalTerm, subst) {
+  if (!(goalTerm instanceof Var)) return false;
+  if (!subst || !Object.prototype.hasOwnProperty.call(subst, goalTerm.name)) return false;
+
+  let cur = subst[goalTerm.name];
+  const seen = new Set([goalTerm.name]);
+
+  while (cur instanceof Var) {
+    if (seen.has(cur.name)) return true;
+    seen.add(cur.name);
+    if (!Object.prototype.hasOwnProperty.call(subst, cur.name)) return true;
+    cur = subst[cur.name];
+  }
+
+  return false;
+}
+
 function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   const g = applySubstTriple(goal, subst);
   const pv = iriValue(g.p);
@@ -3820,7 +3837,7 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   // Schema: $s+ log:rawType $o-
   // Returns one of log:Formula, log:Literal, rdf:List, or log:Other.
   if (pv === LOG_NS + 'rawType') {
-    if (g.s instanceof Var) return [];
+    if (g.s instanceof Var && !__varCameFromBoundSubstitution(goal.s, subst)) return [];
 
     let ty;
     if (g.s instanceof GraphTerm) ty = internIri(LOG_NS + 'Formula');
@@ -4870,7 +4887,11 @@ module.exports = {
 
 'use strict';
 
+const path = require('node:path');
+const { pathToFileURL } = require('node:url');
+
 const engine = require('./engine');
+const deref = require('./deref');
 const { PrefixEnv } = require('./prelude');
 
 function offsetToLineCol(text, offset) {
@@ -4913,6 +4934,29 @@ function readTextFromStdinSync() {
   return fs.readFileSync(0, { encoding: 'utf8' });
 }
 
+function __isNetworkOrFileIri(s) {
+  return typeof s === 'string' && /^(https?:|file:\/\/)/i.test(s);
+}
+
+function __sourceLabelToBaseIri(sourceLabel) {
+  if (!sourceLabel || sourceLabel === '<stdin>') return '';
+  if (__isNetworkOrFileIri(sourceLabel)) return deref.stripFragment(sourceLabel);
+  return pathToFileURL(path.resolve(sourceLabel)).toString();
+}
+
+function __readInputSourceSync(sourceLabel) {
+  if (sourceLabel === '<stdin>') return readTextFromStdinSync();
+
+  if (__isNetworkOrFileIri(sourceLabel)) {
+    const txt = deref.derefTextSync(sourceLabel);
+    if (typeof txt !== 'string') throw new Error(`Failed to dereference ${sourceLabel}`);
+    return txt;
+  }
+
+  const fs = require('node:fs');
+  return fs.readFileSync(sourceLabel, { encoding: 'utf8' });
+}
+
 function main() {
   // Drop "node" and script name; keep only user-provided args
   // Expand combined short options: -pt == -p -t
@@ -5026,13 +5070,11 @@ function main() {
   }
 
   const sourceLabel = useImplicitStdin || positional[0] === '-' ? '<stdin>' : positional[0];
+  const baseIri = __sourceLabelToBaseIri(sourceLabel);
+
   let text;
   try {
-    if (sourceLabel === '<stdin>') text = readTextFromStdinSync();
-    else {
-      const fs = require('node:fs');
-      text = fs.readFileSync(sourceLabel, { encoding: 'utf8' });
-    }
+    text = __readInputSourceSync(sourceLabel);
   } catch (e) {
     if (sourceLabel === '<stdin>') console.error(`Error reading stdin: ${e.message}`);
     else console.error(`Error reading file ${JSON.stringify(sourceLabel)}: ${e.message}`);
@@ -5044,6 +5086,7 @@ function main() {
   try {
     toks = engine.lex(text);
     const parser = new engine.Parser(toks);
+    if (baseIri) parser.prefixes.setBase(baseIri);
     [prefixes, triples, frules, brules, qrules] = parser.parseDocument();
     // Make the parsed prefixes available to log:trace output (CLI path)
     engine.setTracePrefixes(prefixes);
@@ -5951,21 +5994,80 @@ function __isStrictGroundTriple(tr) {
 // -----------------------------------------------------------------------------
 // Used to maintain O(1) membership sets for dynamically promoted rules, and to
 // memoize per-firing head-blank skolemization.
+//
+// Important: variables and blank nodes *inside quoted formulas* are local to the
+// formula. Canonicalize those labels by first occurrence so alpha-equivalent
+// formulas (for example the repeated results of log:semantics after
+// standardize-apart) get the same identity key. Keep top-level blank labels
+// untouched so distinct existential witnesses in the global fact set do not
+// collapse together.
+function __keyFromTermForRuleIdentity(term) {
+  const ctx = { quotedVar: new Map(), quotedBlank: new Map() };
+
+  function canonQuotedVar(name) {
+    let out = ctx.quotedVar.get(name);
+    if (!out) {
+      out = `v${ctx.quotedVar.size}`;
+      ctx.quotedVar.set(name, out);
+    }
+    return out;
+  }
+
+  function canonQuotedBlank(label) {
+    let out = ctx.quotedBlank.get(label);
+    if (!out) {
+      out = `b${ctx.quotedBlank.size}`;
+      ctx.quotedBlank.set(label, out);
+    }
+    return out;
+  }
+
+  function enc(u, inQuotedFormula) {
+    if (u instanceof Iri) return ['I', u.value];
+    if (u instanceof Literal) return ['L', u.value];
+    if (u instanceof Blank) return inQuotedFormula ? ['BQ', canonQuotedBlank(u.label)] : ['B', u.label];
+    if (u instanceof Var) return inQuotedFormula ? ['VQ', canonQuotedVar(u.name)] : ['V', u.name];
+    if (u instanceof ListTerm) return ['List', u.elems.map((e) => enc(e, inQuotedFormula))];
+    if (u instanceof OpenListTerm) {
+      return [
+        'OpenList',
+        u.prefix.map((e) => enc(e, inQuotedFormula)),
+        inQuotedFormula ? ['TailVQ', canonQuotedVar(u.tailVar)] : ['TailV', u.tailVar],
+      ];
+    }
+    if (u instanceof GraphTerm)
+      return ['Graph', u.triples.map((tr) => [enc(tr.s, true), enc(tr.p, true), enc(tr.o, true)])];
+    return ['Other', String(u)];
+  }
+
+  return JSON.stringify(enc(term, false));
+}
+
 function __ruleKey(isForward, isFuse, premise, conclusion, dynamicConclusionTerm /* optional */) {
   let out = (isForward ? 'F' : 'B') + (isFuse ? '!' : '') + '|P|';
   for (let i = 0; i < premise.length; i++) {
     const tr = premise[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   out += '|C|';
   for (let i = 0; i < conclusion.length; i++) {
     const tr = conclusion[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   if (dynamicConclusionTerm) {
-    out += '|T|' + skolemKeyFromTerm(dynamicConclusionTerm);
+    out += '|T|' + __keyFromTermForRuleIdentity(dynamicConclusionTerm);
   }
   return out;
 }
@@ -5976,7 +6078,12 @@ function __firingKey(ruleIndex, instantiatedPremises) {
   for (let i = 0; i < instantiatedPremises.length; i++) {
     const tr = instantiatedPremises[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   return out;
 }
@@ -6534,14 +6641,44 @@ function collectProtectedNamesInTerm(t, protectedVars, protectedBlanks) {
   }
 }
 
-function collectProtectedNamesFromSubst(subst) {
+function collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, seenVarNames) {
+  if (term instanceof Var) {
+    if (!subst || !Object.prototype.hasOwnProperty.call(subst, term.name)) return;
+    if (seenVarNames.has(term.name)) return;
+    seenVarNames.add(term.name);
+    collectProtectedNamesInTerm(subst[term.name], protectedVars, protectedBlanks);
+    return;
+  }
+
+  if (term instanceof ListTerm) {
+    for (const e of term.elems)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    return;
+  }
+
+  if (term instanceof OpenListTerm) {
+    for (const e of term.prefix)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    if (subst && Object.prototype.hasOwnProperty.call(subst, term.tailVar) && !seenVarNames.has(term.tailVar)) {
+      seenVarNames.add(term.tailVar);
+      collectProtectedNamesInTerm(subst[term.tailVar], protectedVars, protectedBlanks);
+    }
+    return;
+  }
+
+  if (term instanceof GraphTerm) {
+    for (const tr of term.triples) {
+      collectProtectedNamesFromTermViaSubst(tr.s, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.p, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.o, subst, protectedVars, protectedBlanks, seenVarNames);
+    }
+  }
+}
+
+function collectProtectedNamesForTerm(term, subst) {
   const protectedVars = new Set();
   const protectedBlanks = new Set();
-  if (!subst) return { protectedVars, protectedBlanks };
-  for (const k in subst) {
-    if (!Object.prototype.hasOwnProperty.call(subst, k)) continue;
-    collectProtectedNamesInTerm(subst[k], protectedVars, protectedBlanks);
-  }
+  collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, new Set());
   return { protectedVars, protectedBlanks };
 }
 
@@ -7503,6 +7640,9 @@ function unifyTermListAppend(a, b, subst) {
 }
 
 function unifyTermWithOptions(a, b, subst, opts) {
+  const aRaw = a;
+  const bRaw = b;
+
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
@@ -7610,13 +7750,14 @@ function unifyTermWithOptions(a, b, subst, opts) {
 
   // Graphs
   if (a instanceof GraphTerm && b instanceof GraphTerm) {
-    const protectedNames = collectProtectedNamesFromSubst(subst);
+    const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+    const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
     if (
       alphaEqGraphTriples(a.triples, b.triples, {
-        protectedVarsA: protectedNames.protectedVars,
-        protectedVarsB: protectedNames.protectedVars,
-        protectedBlanksA: protectedNames.protectedBlanks,
-        protectedBlanksB: protectedNames.protectedBlanks,
+        protectedVarsA: protectedNamesA.protectedVars,
+        protectedVarsB: protectedNamesB.protectedVars,
+        protectedBlanksA: protectedNamesA.protectedBlanks,
+        protectedBlanksB: protectedNamesB.protectedBlanks,
       })
     ) {
       return subst;
@@ -7920,6 +8061,9 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
   }
 
   function unifyTermTrail(a, b) {
+    const aRaw = a;
+    const bRaw = b;
+
     a = applySubstTerm(a, substMut);
     b = applySubstTerm(b, substMut);
 
@@ -7997,24 +8141,25 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
 
     // Graphs
     if (a instanceof GraphTerm && b instanceof GraphTerm) {
-      const protectedNames = collectProtectedNamesFromSubst(substMut);
+      const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+      const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
       if (
         alphaEqGraphTriples(a.triples, b.triples, {
-          protectedVarsA: protectedNames.protectedVars,
-          protectedVarsB: protectedNames.protectedVars,
-          protectedBlanksA: protectedNames.protectedBlanks,
-          protectedBlanksB: protectedNames.protectedBlanks,
+          protectedVarsA: protectedNamesA.protectedVars,
+          protectedVarsB: protectedNamesB.protectedVars,
+          protectedBlanksA: protectedNamesA.protectedBlanks,
+          protectedBlanksB: protectedNamesB.protectedBlanks,
         })
       ) {
         return true;
       }
-      // Fallback: reuse allocation-heavy graph unifier rarely hit in typical workloads.
-      const delta = unifyGraphTriples(a.triples, b.triples, {});
-      if (delta === null) return false;
+      const merged = unifyGraphTriples(a.triples, b.triples, substMut);
+      if (merged === null) return false;
       const mark = trail.length;
-      for (const k in delta) {
-        if (!Object.prototype.hasOwnProperty.call(delta, k)) continue;
-        if (!bindVarTrail(k, delta[k])) {
+      for (const k in merged) {
+        if (!Object.prototype.hasOwnProperty.call(merged, k)) continue;
+        if (Object.prototype.hasOwnProperty.call(substMut, k)) continue;
+        if (!bindVarTrail(k, merged[k])) {
           undoTo(mark);
           return false;
         }
@@ -8216,7 +8361,17 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
       if (remaining <= 0) continue;
       const builtinMax = Number.isFinite(remaining) && !restGoals.length ? remaining : undefined;
 
-      let deltas = evalBuiltin(goal0, {}, facts, backRules, frame.curDepth, varGen, builtinMax);
+      const builtinGoalForEval = goalPredicateIri === LOG_NS + 'rawType' ? rawGoal : goal0;
+      const builtinSubstForEval = goalPredicateIri === LOG_NS + 'rawType' ? substMut : {};
+      let deltas = evalBuiltin(
+        builtinGoalForEval,
+        builtinSubstForEval,
+        facts,
+        backRules,
+        frame.curDepth,
+        varGen,
+        builtinMax,
+      );
 
       const dc = typeof frame.deferCount === 'number' ? frame.deferCount : 0;
       const builtinDeltasAreVacuous = deltas.length > 0 && deltas.every((d) => Object.keys(d).length === 0);

package/lib/builtins.js

@@ -1875,6 +1875,23 @@ function __logNaturalPriorityFromTerm(t) {
 // ===========================================================================
 // Backward proof & builtins mutual recursion — declarations first
 
+function __varCameFromBoundSubstitution(goalTerm, subst) {
+  if (!(goalTerm instanceof Var)) return false;
+  if (!subst || !Object.prototype.hasOwnProperty.call(subst, goalTerm.name)) return false;
+
+  let cur = subst[goalTerm.name];
+  const seen = new Set([goalTerm.name]);
+
+  while (cur instanceof Var) {
+    if (seen.has(cur.name)) return true;
+    seen.add(cur.name);
+    if (!Object.prototype.hasOwnProperty.call(subst, cur.name)) return true;
+    cur = subst[cur.name];
+  }
+
+  return false;
+}
+
 function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   const g = applySubstTriple(goal, subst);
   const pv = iriValue(g.p);
@@ -3341,7 +3358,7 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   // Schema: $s+ log:rawType $o-
   // Returns one of log:Formula, log:Literal, rdf:List, or log:Other.
   if (pv === LOG_NS + 'rawType') {
-    if (g.s instanceof Var) return [];
+    if (g.s instanceof Var && !__varCameFromBoundSubstitution(goal.s, subst)) return [];
 
     let ty;
     if (g.s instanceof GraphTerm) ty = internIri(LOG_NS + 'Formula');

package/lib/cli.js

@@ -7,7 +7,11 @@
 
 'use strict';
 
+const path = require('node:path');
+const { pathToFileURL } = require('node:url');
+
 const engine = require('./engine');
+const deref = require('./deref');
 const { PrefixEnv } = require('./prelude');
 
 function offsetToLineCol(text, offset) {
@@ -50,6 +54,29 @@ function readTextFromStdinSync() {
   return fs.readFileSync(0, { encoding: 'utf8' });
 }
 
+function __isNetworkOrFileIri(s) {
+  return typeof s === 'string' && /^(https?:|file:\/\/)/i.test(s);
+}
+
+function __sourceLabelToBaseIri(sourceLabel) {
+  if (!sourceLabel || sourceLabel === '<stdin>') return '';
+  if (__isNetworkOrFileIri(sourceLabel)) return deref.stripFragment(sourceLabel);
+  return pathToFileURL(path.resolve(sourceLabel)).toString();
+}
+
+function __readInputSourceSync(sourceLabel) {
+  if (sourceLabel === '<stdin>') return readTextFromStdinSync();
+
+  if (__isNetworkOrFileIri(sourceLabel)) {
+    const txt = deref.derefTextSync(sourceLabel);
+    if (typeof txt !== 'string') throw new Error(`Failed to dereference ${sourceLabel}`);
+    return txt;
+  }
+
+  const fs = require('node:fs');
+  return fs.readFileSync(sourceLabel, { encoding: 'utf8' });
+}
+
 function main() {
   // Drop "node" and script name; keep only user-provided args
   // Expand combined short options: -pt == -p -t
@@ -163,13 +190,11 @@ function main() {
   }
 
   const sourceLabel = useImplicitStdin || positional[0] === '-' ? '<stdin>' : positional[0];
+  const baseIri = __sourceLabelToBaseIri(sourceLabel);
+
   let text;
   try {
-    if (sourceLabel === '<stdin>') text = readTextFromStdinSync();
-    else {
-      const fs = require('node:fs');
-      text = fs.readFileSync(sourceLabel, { encoding: 'utf8' });
-    }
+    text = __readInputSourceSync(sourceLabel);
   } catch (e) {
     if (sourceLabel === '<stdin>') console.error(`Error reading stdin: ${e.message}`);
     else console.error(`Error reading file ${JSON.stringify(sourceLabel)}: ${e.message}`);
@@ -181,6 +206,7 @@ function main() {
   try {
     toks = engine.lex(text);
     const parser = new engine.Parser(toks);
+    if (baseIri) parser.prefixes.setBase(baseIri);
     [prefixes, triples, frules, brules, qrules] = parser.parseDocument();
     // Make the parsed prefixes available to log:trace output (CLI path)
     engine.setTracePrefixes(prefixes);

package/lib/engine.js

@@ -199,21 +199,80 @@ function __isStrictGroundTriple(tr) {
 // -----------------------------------------------------------------------------
 // Used to maintain O(1) membership sets for dynamically promoted rules, and to
 // memoize per-firing head-blank skolemization.
+//
+// Important: variables and blank nodes *inside quoted formulas* are local to the
+// formula. Canonicalize those labels by first occurrence so alpha-equivalent
+// formulas (for example the repeated results of log:semantics after
+// standardize-apart) get the same identity key. Keep top-level blank labels
+// untouched so distinct existential witnesses in the global fact set do not
+// collapse together.
+function __keyFromTermForRuleIdentity(term) {
+  const ctx = { quotedVar: new Map(), quotedBlank: new Map() };
+
+  function canonQuotedVar(name) {
+    let out = ctx.quotedVar.get(name);
+    if (!out) {
+      out = `v${ctx.quotedVar.size}`;
+      ctx.quotedVar.set(name, out);
+    }
+    return out;
+  }
+
+  function canonQuotedBlank(label) {
+    let out = ctx.quotedBlank.get(label);
+    if (!out) {
+      out = `b${ctx.quotedBlank.size}`;
+      ctx.quotedBlank.set(label, out);
+    }
+    return out;
+  }
+
+  function enc(u, inQuotedFormula) {
+    if (u instanceof Iri) return ['I', u.value];
+    if (u instanceof Literal) return ['L', u.value];
+    if (u instanceof Blank) return inQuotedFormula ? ['BQ', canonQuotedBlank(u.label)] : ['B', u.label];
+    if (u instanceof Var) return inQuotedFormula ? ['VQ', canonQuotedVar(u.name)] : ['V', u.name];
+    if (u instanceof ListTerm) return ['List', u.elems.map((e) => enc(e, inQuotedFormula))];
+    if (u instanceof OpenListTerm) {
+      return [
+        'OpenList',
+        u.prefix.map((e) => enc(e, inQuotedFormula)),
+        inQuotedFormula ? ['TailVQ', canonQuotedVar(u.tailVar)] : ['TailV', u.tailVar],
+      ];
+    }
+    if (u instanceof GraphTerm)
+      return ['Graph', u.triples.map((tr) => [enc(tr.s, true), enc(tr.p, true), enc(tr.o, true)])];
+    return ['Other', String(u)];
+  }
+
+  return JSON.stringify(enc(term, false));
+}
+
 function __ruleKey(isForward, isFuse, premise, conclusion, dynamicConclusionTerm /* optional */) {
   let out = (isForward ? 'F' : 'B') + (isFuse ? '!' : '') + '|P|';
   for (let i = 0; i < premise.length; i++) {
     const tr = premise[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   out += '|C|';
   for (let i = 0; i < conclusion.length; i++) {
     const tr = conclusion[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   if (dynamicConclusionTerm) {
-    out += '|T|' + skolemKeyFromTerm(dynamicConclusionTerm);
+    out += '|T|' + __keyFromTermForRuleIdentity(dynamicConclusionTerm);
   }
   return out;
 }
@@ -224,7 +283,12 @@ function __firingKey(ruleIndex, instantiatedPremises) {
   for (let i = 0; i < instantiatedPremises.length; i++) {
     const tr = instantiatedPremises[i];
     if (i) out += '\n';
-    out += skolemKeyFromTerm(tr.s) + '\t' + skolemKeyFromTerm(tr.p) + '\t' + skolemKeyFromTerm(tr.o);
+    out +=
+      __keyFromTermForRuleIdentity(tr.s) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.p) +
+      '\t' +
+      __keyFromTermForRuleIdentity(tr.o);
   }
   return out;
 }
@@ -782,14 +846,44 @@ function collectProtectedNamesInTerm(t, protectedVars, protectedBlanks) {
   }
 }
 
-function collectProtectedNamesFromSubst(subst) {
+function collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, seenVarNames) {
+  if (term instanceof Var) {
+    if (!subst || !Object.prototype.hasOwnProperty.call(subst, term.name)) return;
+    if (seenVarNames.has(term.name)) return;
+    seenVarNames.add(term.name);
+    collectProtectedNamesInTerm(subst[term.name], protectedVars, protectedBlanks);
+    return;
+  }
+
+  if (term instanceof ListTerm) {
+    for (const e of term.elems)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    return;
+  }
+
+  if (term instanceof OpenListTerm) {
+    for (const e of term.prefix)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    if (subst && Object.prototype.hasOwnProperty.call(subst, term.tailVar) && !seenVarNames.has(term.tailVar)) {
+      seenVarNames.add(term.tailVar);
+      collectProtectedNamesInTerm(subst[term.tailVar], protectedVars, protectedBlanks);
+    }
+    return;
+  }
+
+  if (term instanceof GraphTerm) {
+    for (const tr of term.triples) {
+      collectProtectedNamesFromTermViaSubst(tr.s, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.p, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.o, subst, protectedVars, protectedBlanks, seenVarNames);
+    }
+  }
+}
+
+function collectProtectedNamesForTerm(term, subst) {
   const protectedVars = new Set();
   const protectedBlanks = new Set();
-  if (!subst) return { protectedVars, protectedBlanks };
-  for (const k in subst) {
-    if (!Object.prototype.hasOwnProperty.call(subst, k)) continue;
-    collectProtectedNamesInTerm(subst[k], protectedVars, protectedBlanks);
-  }
+  collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, new Set());
   return { protectedVars, protectedBlanks };
 }
 
@@ -1751,6 +1845,9 @@ function unifyTermListAppend(a, b, subst) {
 }
 
 function unifyTermWithOptions(a, b, subst, opts) {
+  const aRaw = a;
+  const bRaw = b;
+
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
@@ -1858,13 +1955,14 @@ function unifyTermWithOptions(a, b, subst, opts) {
 
   // Graphs
   if (a instanceof GraphTerm && b instanceof GraphTerm) {
-    const protectedNames = collectProtectedNamesFromSubst(subst);
+    const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+    const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
     if (
       alphaEqGraphTriples(a.triples, b.triples, {
-        protectedVarsA: protectedNames.protectedVars,
-        protectedVarsB: protectedNames.protectedVars,
-        protectedBlanksA: protectedNames.protectedBlanks,
-        protectedBlanksB: protectedNames.protectedBlanks,
+        protectedVarsA: protectedNamesA.protectedVars,
+        protectedVarsB: protectedNamesB.protectedVars,
+        protectedBlanksA: protectedNamesA.protectedBlanks,
+        protectedBlanksB: protectedNamesB.protectedBlanks,
       })
     ) {
       return subst;
@@ -2168,6 +2266,9 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
   }
 
   function unifyTermTrail(a, b) {
+    const aRaw = a;
+    const bRaw = b;
+
     a = applySubstTerm(a, substMut);
     b = applySubstTerm(b, substMut);
 
@@ -2245,24 +2346,25 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
 
     // Graphs
     if (a instanceof GraphTerm && b instanceof GraphTerm) {
-      const protectedNames = collectProtectedNamesFromSubst(substMut);
+      const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+      const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
       if (
         alphaEqGraphTriples(a.triples, b.triples, {
-          protectedVarsA: protectedNames.protectedVars,
-          protectedVarsB: protectedNames.protectedVars,
-          protectedBlanksA: protectedNames.protectedBlanks,
-          protectedBlanksB: protectedNames.protectedBlanks,
+          protectedVarsA: protectedNamesA.protectedVars,
+          protectedVarsB: protectedNamesB.protectedVars,
+          protectedBlanksA: protectedNamesA.protectedBlanks,
+          protectedBlanksB: protectedNamesB.protectedBlanks,
         })
       ) {
         return true;
       }
-      // Fallback: reuse allocation-heavy graph unifier rarely hit in typical workloads.
-      const delta = unifyGraphTriples(a.triples, b.triples, {});
-      if (delta === null) return false;
+      const merged = unifyGraphTriples(a.triples, b.triples, substMut);
+      if (merged === null) return false;
       const mark = trail.length;
-      for (const k in delta) {
-        if (!Object.prototype.hasOwnProperty.call(delta, k)) continue;
-        if (!bindVarTrail(k, delta[k])) {
+      for (const k in merged) {
+        if (!Object.prototype.hasOwnProperty.call(merged, k)) continue;
+        if (Object.prototype.hasOwnProperty.call(substMut, k)) continue;
+        if (!bindVarTrail(k, merged[k])) {
           undoTo(mark);
           return false;
         }
@@ -2464,7 +2566,17 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
       if (remaining <= 0) continue;
       const builtinMax = Number.isFinite(remaining) && !restGoals.length ? remaining : undefined;
 
-      let deltas = evalBuiltin(goal0, {}, facts, backRules, frame.curDepth, varGen, builtinMax);
+      const builtinGoalForEval = goalPredicateIri === LOG_NS + 'rawType' ? rawGoal : goal0;
+      const builtinSubstForEval = goalPredicateIri === LOG_NS + 'rawType' ? substMut : {};
+      let deltas = evalBuiltin(
+        builtinGoalForEval,
+        builtinSubstForEval,
+        facts,
+        backRules,
+        frame.curDepth,
+        varGen,
+        builtinMax,
+      );
 
       const dc = typeof frame.deferCount === 'number' ? frame.deferCount : 0;
       const builtinDeltasAreVacuous = deltas.length > 0 && deltas.every((d) => Object.keys(d).length === 0);