eyeprolog 1.3.75 → 1.3.77

package/src/quads.js

@@ -110,10 +110,15 @@ function checkAlternative(program, quad, alternative, options, context) {
   const actual = executeQuery(program, quad.query, input, maxSolutions, {
     ...options,
     detectLoops: leaves.some((leaf) => leaf.loops),
+    detectWaits: leaves.some((leaf) => leaf.waits),
     inputBoundary: hasInputSpec,
     inputPeek: peek,
   });
 
+  if (leaves.some((leaf) => leaf.waits)) {
+    return { ok: leaves.length === 1 && actual.inputWaitObserved };
+  }
+
   if (requiresSto) {
     // Trealla currently treats the answer part of an `sto`-annotated leaf as
     // implementation-dependent and skips it. EyeProlog can strengthen that
@@ -199,6 +204,7 @@ function describeLeaf(term) {
     false: false,
     truth: false,
     loops: false,
+    waits: false,
     error: null,
     input: null,
     peek: null,
@@ -213,7 +219,8 @@ function describeLeaf(term) {
       else if (item.name === '...' || item.name === 'ad_infinitum') leaf.more = true;
       else if (item.name === 'sto') leaf.sto = true;
       else if (item.name === 'loops') leaf.loops = true;
-      else if (item.name === 'waits' || item.name === 'other_answer_sequence') {
+      else if (item.name === 'waits') leaf.waits = true;
+      else if (item.name === 'other_answer_sequence') {
         leaf.unsupported ??= item;
       } else if (item.name === 'false') leaf.false = true;
       else if (item.name === 'true') leaf.truth = true;
@@ -246,7 +253,8 @@ function describeLeaf(term) {
     if (isErrorDescription(item)) leaf.error = item;
     else leaf.malformed ??= item;
   }
-  leaf.hasExpectation = leaf.bindings.length > 0 || leaf.truth || leaf.false || leaf.loops || leaf.error != null || leaf.output != null;
+  leaf.hasExpectation = leaf.bindings.length > 0 || leaf.truth || leaf.false || leaf.loops || leaf.waits ||
+    leaf.error != null || leaf.output != null;
   if (!leaf.hasExpectation && !leaf.more && !leaf.sto && leaf.unsupported == null) leaf.malformed ??= term;
   if ([leaf.false, leaf.truth, leaf.error != null].filter(Boolean).length > 1) leaf.malformed ??= term;
   return leaf;
@@ -254,6 +262,7 @@ function describeLeaf(term) {
 
 function executeQuery(program, query, input, maxSolutions, options) {
   let pendingOutput = '';
+  let inputWaitObserved = false;
   const boundedInput = options.inputBoundary
     ? `${input}${options.inputPeek ?? ''}${INVALID_UTF8_SENTINEL}`
     : input;
@@ -274,13 +283,24 @@ function executeQuery(program, query, input, maxSolutions, options) {
       write: (text) => { pendingOutput += String(text); },
     },
   });
+  if (options.detectWaits) {
+    const inputStream = solver.io.resolve('user_input');
+    const observeWait = () => {
+      inputWaitObserved = true;
+      return null;
+    };
+    inputStream.interactiveReadTerm = observeWait;
+    inputStream.interactiveReadUnit = observeWait;
+  }
   if (options.inputBoundary) {
     // Quads need a boundary that is neither EOF nor a valid character.  This
     // mirrors Trealla's sentinel technique: inputs/1 says exactly what was
     // consumed, while peeks/1 supplies one additional character that must
     // remain unread.  If the query asks for anything beyond that boundary it
     // sees representation_error(character), not an artificial EOF.
-    solver.io.resolve('user_input').strictUtf8 = true;
+    const inputStream = solver.io.resolve('user_input');
+    inputStream.strictUtf8 = true;
+    inputStream.syntheticInputBoundary = input.length;
   }
   // Undefined predicates are test failures rather than silent negative
   // answers unless the source explicitly selected another unknown policy.
@@ -338,6 +358,7 @@ function executeQuery(program, query, input, maxSolutions, options) {
     inputRemainder,
     complete,
     loopObserved,
+    inputWaitObserved,
     stoObserved: solver.occursCheckObserved,
     nstoObserved: complete && !solver.occursCheckObserved && !loopObserved &&
       !bounded && !resourceInterrupted,

package/src/repl.js

@@ -722,6 +722,12 @@ function formatAnswer(engine, state, variables, env) {
     : equality.specifier === 'xfy' ? equality.priority : equality.priority - 1;
   let generated = 0;
 
+  // Meta-predicate wrappers can make a query variable alias an internal fresh
+  // variable. Keep residual constraints tied to the query's visible name.
+  for (const variable of variables) {
+    const root = engine.deref(variable, env);
+    if (root.type === 'var' && !names.has(root.name)) names.set(root.name, variable.name);
+  }
   for (const variable of variables) collectUnboundVariables(engine, variable, env, names, () => `_${letterName(generated++)}`);
   for (const variable of variables) {
     const value = engine.deref(variable, env);
@@ -797,7 +803,7 @@ function letterName(index) {
 }
 
 function formatError(engine, state, error) {
-  if (error?.name === 'PrologError') {
+  if (error?.name === 'PrologError' || (error?.name === 'ThrownTerm' && error.term != null)) {
     const env = new engine.Env();
     const variableNames = new Map();
     let generated = 0;
@@ -805,7 +811,9 @@ function formatError(engine, state, error) {
     // Reuse the same conversion as catch/3 so uncaught errors at the top
     // level cannot lose the implementation-defined context or misplace a
     // culprit as the second argument of error/2.
-    const term = formalErrorTerm(error);
+    const term = error.name === 'ThrownTerm'
+      ? engine.compound('throw', [error.term])
+      : formalErrorTerm(error);
     collectUnboundVariables(engine, term, env, variableNames, () => `_${letterName(generated++)}`);
     return `${engine.formatTermForWrite(term, env, {
       quoted: true,

package/src/solver.js

@@ -1428,12 +1428,12 @@ function pushWfsAnswerFrames(stack, model, group, goal, rest, env, depth, active
 
 function bundledBetweenIterator(solver, group, goal, env) {
   if (solver.registry.eyePrologLibrary !== true ||
-      group.module !== 'prologue' || group.name !== 'between' || group.arity !== 3 ||
+      group.module !== 'between' || group.name !== 'between' || group.arity !== 3 ||
       group.bundledLibrary !== true || group.clauses.length !== 1) {
     return null;
   }
 
-  // The portable Prologue definition is intentionally kept as the semantic
+  // The portable library(between) definition is kept as the semantic
   // source of between/3. Its recursive helper, however, carries the output
   // variable through one fresh clause instance per integer. With persistent
   // environments that builds a growing variable-alias chain, so dereferencing
@@ -1475,7 +1475,7 @@ function* bundledBetweenSolutions(solver, goal, env) {
 
 function bundledMemberIterator(solver, group, goal, env) {
   if (solver.registry.eyePrologLibrary !== true ||
-      !['lists', 'prologue'].includes(group.module) || group.name !== 'member' || group.arity !== 2 ||
+      group.module !== 'lists' || group.name !== 'member' || group.arity !== 2 ||
       group.bundledLibrary !== true || group.clauses.length !== 2) {
     return null;
   }
@@ -1588,7 +1588,7 @@ function* bundledEllipsisSolutions(solver, output, input, env) {
 
 function bundledLengthIterator(solver, group, goal, env) {
   if (solver.registry.eyePrologLibrary !== true ||
-      !['lists', 'prologue'].includes(group.module) || group.name !== 'length' || group.arity !== 2 ||
+      group.module !== 'lists' || group.name !== 'length' || group.arity !== 2 ||
       group.bundledLibrary !== true || group.clauses.length !== 2) {
     return null;
   }
@@ -1900,7 +1900,7 @@ function findallLengthFusion(solver, goal, rest, env) {
   if (lengthGoal.type !== COMPOUND || lengthGoal.name !== 'length' || lengthGoal.arity !== 2) return null;
   const lengthGroup = solver.program.findGroup('length', 2, lengthGoal.module ?? 'user');
   if (!lengthGroup || lengthGroup.bundledLibrary !== true ||
-      !['lists', 'prologue'].includes(lengthGroup.module)) return null;
+      lengthGroup.module !== 'lists') return null;
   const lengthList = derefForLocal(lengthGoal.args[0], env);
   const countArg = derefForLocal(lengthGoal.args[1], env);
   if (lengthList.type !== 'var' || lengthList.name !== bag.name || countArg.type !== 'var') return null;

package/src/standard-library.js

@@ -141,11 +141,10 @@ export const eyePrologInteropAutoload = Object.freeze({
   // unchanged while their implementations remain outside the ISO core.
   'time/1': 'iso_ext',
   '.../2': 'iso_ext',
-  // Trealla and Scryer expose between/3 without an EyeProlog-style
-  // library(prologue) dependency.  EyeProlog keeps its implementation in the
-  // Prologue module but autoloads it so portable source need not name that
-  // implementation-specific library.
-  'between/3': 'prologue',
+  // Scryer provides library(between), while Trealla exposes the relation as a
+  // system predicate. Keep EyeProlog's canonical portable owner in the
+  // specialized module; library(prologue) re-exports it for compatibility.
+  'between/3': 'between',
 });
 
 export const eyePrologInteropLibraryIndicators = Object.freeze(
@@ -155,7 +154,7 @@ export const eyePrologInteropLibraryIndicators = Object.freeze(
 // Libraries whose *name* is part of the current interop profile.  A program
 // may freely use_module/1 with these common module names; predicates in those
 // modules outside eyePrologInteropLibraryIndicators are still diagnosed when used.
-export const eyePrologInteropLibraryModules = Object.freeze(['lists', 'iso_ext', 'lambda', 'atts']);
+export const eyePrologInteropLibraryModules = Object.freeze(['lists', 'iso_ext', 'lambda', 'atts', 'freeze']);
 
 function* tabledNegationBuiltin({ solver, goal, env }) {
   yield* solver.solveTabledNegation(goal.args[0], env);

package/src/term.js

@@ -650,6 +650,7 @@ export function unify(left, right, env, options = {}) {
   // unification: a variable cannot be bound to a term containing itself.
   // Bindings are written into the supplied Env.
   const occursCheckHandler = options.occursCheck === 'fail' ? null : env?._occursCheckHandler;
+  const runAttributeHooks = options.skipAttributeHooks !== true;
   // Callers may provide a proof that selected variables cannot occur in the
   // term they are about to receive.  Source-level first-use analysis and a few
   // construction fast paths share this internal proof; ordinary unification
@@ -663,7 +664,7 @@ export function unify(left, right, env, options = {}) {
 
     if (a.type === VAR && b.type === VAR && a.name === b.name) continue;
     if (a.type === VAR && b.type === VAR) {
-      if (env?._prologAttributes != null) {
+      if (runAttributeHooks && env?._prologAttributes != null) {
         if (!env.preparePrologAttributeUnification(a, b)) return false;
         a = deref(a, env);
         b = deref(b, env);
@@ -694,7 +695,7 @@ export function unify(left, right, env, options = {}) {
         occursCheckHandler?.(a, b, env);
         return false;
       }
-      if (env?._prologAttributes != null && env.hasPrologAttributes(a.name)) {
+      if (runAttributeHooks && env?._prologAttributes != null && env.hasPrologAttributes(a.name)) {
         if (!env.preparePrologAttributeUnification(a, b)) return false;
         a = deref(a, env);
         b = deref(b, env);
@@ -712,7 +713,7 @@ export function unify(left, right, env, options = {}) {
         occursCheckHandler?.(b, a, env);
         return false;
       }
-      if (env?._prologAttributes != null && env.hasPrologAttributes(b.name)) {
+      if (runAttributeHooks && env?._prologAttributes != null && env.hasPrologAttributes(b.name)) {
         if (!env.preparePrologAttributeUnification(b, a)) return false;
         b = deref(b, env);
         a = deref(a, env);

package/test/fixtures/README.md

@@ -9,6 +9,14 @@ Retrieved on 2026-08-11. It is vendored so the regression suite exercises all
 58 quads without depending on network access or availability of the source
 server.
 
+`variable_names_quad.pl` is an unmodified snapshot of the 75 machine-readable
+quads for the ISO read and write option `variable_names/1`:
+
+<https://www.complang.tuwien.ac.at/ulrich/iso-prolog/variable_names_quad.pl>
+
+Retrieved on 2026-08-25. It is vendored so all input, output, waiting, and
+error cases remain release-gated.
+
 `prologue_quad.pl` is an unmodified snapshot of the 33 machine-readable quads
 for the predicates proposed by the Prolog Prologue working draft:
 

package/test/fixtures/variable_names_quad.pl

@@ -0,0 +1,163 @@
+1  ?- write_term(T,[quoted(true),variable_names([N=T])]).
+      instantiation_error.
+2  ?- N = 'X', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("X"), N = 'X'.
+      outputs("X"), N = ... . % Same, ignoring 'X'
+3  ?- N = T, /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      instantiation_error.
+4  ?- N = '_', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("_"), N = ... .
+65 ?- N = '_/*.*/', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("_/*.*/"), N = ... .
+5  ?- N = x, /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("x"), N = ... .
+6  ?- N = 'x+y', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("x+y"), N = ... .
+50 ?- N = '))', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("))"), N = ... .
+7  ?- N = 7, /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      domain_error(write_option, variable_names(...)).
+8  ?- N = 1+2, /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      domain_error(write_option, variable_names(...)).
+9  ?- N = '$VAR'(9), /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      domain_error(write_option, variable_names(...)).
+10 ?- T = a, /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      instantiation_error.
+11 ?- T = a, N = 'Any', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("a"), T = ..., N = ... .
+12 ?- T = '$VAR'(9), N = '_', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs("'$VAR'(9)"), T = ..., N = ... .
+74 ?- T = f(_), N = 'Bad', /**/write_term(T,[quoted(true),variable_names([N=T])]).
+      outputs(("f(_",...,")")), T = ..., N = ... .
+28 ?- freeze(T,throw(g(T))), N = 'X', /**/write_term(T,[quoted(true),variable_names([N=T])]), false.
+      outputs("X"), false.
+13 ?- write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs(("_",...)).
+14 ?- T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs("X,Y,Z"), T = ... .
+15 ?- Z=Y, T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs("X,Y,Y"), Z = Y, T = ... .
+16 ?- Z=Y, Y=X, T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs("X,X,X"), Z = X, Y = X, T = ... .
+17 ?- T=(Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs("Y,Z"), T = ... .
+18 ?- T=(Z,Y), /**/write_term(T,[quoted(true),variable_names(['X'=X,'Y'=Y,'Z'=Z])]).
+      outputs("Z,Y"), T = ... .
+19 ?- write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs(("_",...)).
+20 ?- T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs("X,Y,Z"), T = ... .
+21 ?- Z=Y, T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs("X,Z,Z"), Z = Y, T = ... .
+22 ?- Z=Y, Y=X, T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs("Z,Z,Z"), Z = X, Y = X, T = ... .
+23 ?- T=(Y,Z), /**/write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs("Y,Z"), T = ... .
+24 ?- T=(Z,Y), /**/write_term(T,[quoted(true),variable_names(['Z'=Z,'Y'=Y,'X'=X])]).
+      outputs("Z,Y"), T = ... .
+25 ?- write_term(T,[quoted(true),variable_names(['X'=Z,'X'=Y,'X'=X])]).
+      outputs(("_",...)).
+26 ?- T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=Z,'X'=Y,'X'=X])]).
+      outputs("X,X,X"), T = ... .
+27 ?- T=(1,2,3), T=(X,Y,Z), /**/write_term(T,[quoted(true),variable_names(['X'=Z,'X'=Y,'X'=X])]).
+      outputs("1,2,3"), T = ..., X = 1, Y = 2, Z = 3.
+32 ?- read_term(T,[variable_names(VN_list)]),VN_list=[_=1,_=2,_=3],writeq(VN_list).
+      waits.
+29 ?- /**/read_term(T,[variable_names(VN_list)]),VN_list=[_=1,_=2,_=3],writeq(VN_list).
+      inputs("B+C+A+B+C+A."), peeks("\n"),
+      outputs("['B'=1,'C'=2,'A'=3]"),
+      T = 1+2+3+1+2+3,
+      VN_list=['B'=1,'C'=2,'A'=3].
+30 ?- write_term(T,[variable_names(VN_list)]).
+      instantiation_error.
+31 ?- VN_list = 1, /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(1)).
+33 ?- VN_list = [[]], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names([[]])).
+34 ?- VN_list = non_list, /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(non_list)).
+35 ?- VN_list = [T='T'|non_list], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names([_='T'|non_list]))
+   |  instantiation_error.
+52 ?- VN_list = ['T'=T|_], /**/write_term(T,[variable_names(VN_list)]).
+      instantiation_error.
+51 ?- VN_list = ['T'=T|non_list], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(...)).
+36 ?- VN_list = [T-'T'], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(...)).
+63 ?- VN_list = [_,a], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(...))
+   |  instantiation_error.
+64 ?- VN_list = [a,_], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(...))
+   |  instantiation_error.
+66 ?- VN_list = [a|_], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option, variable_names(...))
+   |  instantiation_error.
+67 ?- VN_list = [i=i,7=i], /**/write_term(T,[variable_names(VN_list)]).
+      domain_error(write_option,variable_names([i=i,7=i])).
+68 ?- VN_list = [_,_], /**/write_term(T,[variable_names(VN_list)]).
+      instantiation_error.
+43 ?- write_term(-X^2,[variable_names(['X'=X])]).
+      outputs("- (X^2)").
+44 ?- X=1, /**/write_term(-X^2,[variable_names(['X'=X])]).
+      outputs("- (1^2)"), X = ... .
+37 ?- open(f,write,_,[O]).
+      instantiation_error.
+38 ?- O = 1, /**/open(f,write,_,[O]).
+      domain_error(stream_option,1).
+56 ?- O = typex(_), /**/open(f,write,_,[O]).
+      domain_error(stream_option,typex(_)).
+57 ?- O = typex(1), /**/open(f,write,_,[O]).
+      domain_error(stream_option,typex(1)).
+62 ?- O = typex(s(_)), /**/open(f,write,_,[O]).
+      domain_error(stream_option,typex(s(_))).
+39 ?- O = type(text), /**/open(f,write,_,[O]).
+      O = ... .
+40 ?- O = type(1), /**/open(f,write,_,[O]).
+      domain_error(stream_option,type(1)).
+41 ?- O = type(_), /**/open(f,write,_,[O]).
+      instantiation_error.
+60 ?- O = alias(_), /**/open(f,write,_,[O]).
+      instantiation_error.
+42 ?- O = type(nontype), /**/open(f,write,_,[O]).
+      domain_error(stream_option,type(nontype)).
+61 ?- O = alias(1), /**/open(f,write,_,[O]).
+      domain_error(stream_option,alias(1)).
+45 ?- read_term(T,[variable_names(VN_list)]).
+      waits.
+46 ?- /**/read_term(T,[variable_names(VN_list)]).
+      inputs("a."), peeks("\n"),
+      T = a, VN_list = [].
+47 ?- VN_list = 42, /**/read_term(T,[variable_names(VN_list)]).
+      waits.
+48 ?- VN_list = 42, /**/read_term(T,[variable_names(VN_list)]).
+      inputs("a."), peeks("\n"),
+      false.
+49 ?- VN_list = 42, /**/read_term(T,[variable_names(VN_list)]).
+      inputs("a b."), peeks("\n"),
+      syntax_error(...).
+53 ?- write_term(S,[quoted(true),variable_names([N=T])]).
+      instantiation_error.
+54 ?- S=1+T,N='/*r*/V',/**/write_term(S,[quoted(true),variable_names([N=T])]).
+      outputs("1+/*r*/V"), S = ..., N = ...
+   |  outputs("1+ /*r*/V"), S = ..., N = ... .
+55 ?- S=1+T,N=' /*r*/V',/**/write_term(S,[quoted(true),variable_names([N=T])]).
+      outputs("1+ /*r*/V"), S = ..., N = ... .
+58 ?- S=1+T,N=(+),/**/write_term(S,[quoted(true),variable_names([N=T])]).
+      outputs("1++"), S = ..., N = ...
+   |  outputs("1+ +"), S = ..., N = ... .
+59 ?- S=T+1,N=(+),/**/write_term(S,[quoted(true),variable_names([N=T])]).
+      outputs("++1"), S = ..., N = ...
+   |  outputs("+ +1"), S = ..., N = ... .
+73 ?- S=(1 is T),N='X',/**/write_term(S,[quoted(true),variable_names([N=T])]).
+      outputs("1 is X"), S = ..., N = ... .
+69 ?- read_term(T,[singletons(1)]).
+        waits.
+70 ?- /**/read_term(T,[singletons(1)]).
+      inputs("a."), peeks("\n"),
+      false.
+71 ?- write_term(T,[variable_names(['Bad'=T]),variable_names(['Good'=T])]).
+      outputs("Good").
+72 ?- read_term(T,[singletons([])]).
+      waits.

package/test/run-regression.mjs

@@ -127,6 +127,17 @@ function regressionCases() {
           'scalar-fact fast matching still validates annotated variables');
         assertEqual(run('p(b).', { goal: 'dif(X,a),p(X)' }).stats.completed_goal_lists, 1,
           'scalar-fact fast matching can discharge an annotated disequality');
+
+        const freezeProgram = Program.parse(':- use_module(library(freeze), [freeze/2]).');
+        const freezeSolver = new Solver(freezeProgram);
+        const freezeDifGoal = parseGoalText('freeze(X,a),dif(X,c)');
+        const freezeDifAnswer = freezeSolver.solve([freezeDifGoal], new Env(), 0).next();
+        assertEqual(freezeDifAnswer.done, false, 'freeze/2 and dif/2 answer');
+        const freezeResiduals = freezeSolver.attributeResidualGoals(
+          freezeDifGoal.args[0].args[0], freezeDifAnswer.value,
+        );
+        assertEqual(freezeResiduals.length, 1,
+          'freeze/2 residual projection terminates alongside dif/2 (issue #73)');
       },
     },
     {
@@ -190,6 +201,7 @@ check :- call_residue_vars(X in 1..3, Vs), Vs = [X].
 
         const residualFile = path.join(tmp, `atts-residual-${++tmpCounter}.pl`);
         fs.writeFileSync(residualFile, `:- use_module(library(atts)).
+:- use_module(library(freeze), [freeze/2]).
 :- attribute required/1.
 attach(X,V) :- put_atts(X, required(V)).
 verify_attributes(Var, Other, Goals) :-
@@ -199,9 +211,13 @@ verify_attributes(Var, Other, Goals) :-
 same(X,X).
 attribute_goals(X) --> { get_atts(X, required(V)) }, [required(X,V)].
 `);
-        const repl = runCli([], { input: `[${sourceAtom(residualFile)}].\nattach(X,a).\nhalt.\n` });
+        const repl = runCli([], {
+          input: `[${sourceAtom(residualFile)}].\nattach(X,a).\nfreeze(Y,a),dif(Y,c).\nhalt.\n`,
+        });
         assertEqual(repl.status, 0, 'attribute residual REPL status');
         assertIncludes(repl.stdout, 'required(X, a).', 'attribute_goals//1 residual projection');
+        assertIncludes(repl.stdout, 'dif(Y, c), freeze:freeze(Y, a).',
+          'freeze/2 and dif/2 residuals share the query variable (issue #73)');
 
         const scryerShape = Program.parse(`:- module(scryer_shape, [op(700, xfx, #=), probe/0]).
 :- op(700, xfx, #=).
@@ -1549,6 +1565,18 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'quad stderr');
       },
     },
+    {
+      name: 'CLI passes the complete authoritative variable_names quad corpus (issue #69)',
+      run: () => {
+        const filename = path.join(testRoot, 'fixtures', 'variable_names_quad.pl');
+        const source = fs.readFileSync(filename, 'utf8');
+        assertEqual(Program.parse(source).quads.length, 74, 'vendored query-record total');
+        const result = runCli(['-q', filename], { cwd: tmp });
+        assertEqual(result.status, 0, 'quad exit status');
+        assertEqual(result.stdout, 'quads: 75 run, 75 passed, 0 failed.\n', 'quad report');
+        assertEqual(result.stderr, '', 'quad stderr');
+      },
+    },
     {
       name: 'REPL advances anonymous Prologue length checks through I = 28',
       run: () => {
@@ -1809,6 +1837,15 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL displays uncaught user exceptions as throw terms (issue #75)',
+      run: () => {
+        const result = runCli([], { input: 'throw(stopped).\nhalt.\n' });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout, '?-    throw(stopped).\n?- ', 'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL freshens variables displayed in uncaught ISO errors',
       run: () => {
@@ -2814,6 +2851,22 @@ child.stdin.write(\`consult(${consultedAtom}).\\n\`);
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL combines canonical libraries with the Prologue facade',
+      run: () => {
+        const result = runCli([], {
+          input:
+            'use_module(library(freeze)).\n' +
+            'use_module(library(lists)).\n' +
+            'use_module(library(iso_ext)).\n' +
+            'use_module(library(prologue)).\n' +
+            'halt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout, '?-    true.\n?-    true.\n?-    true.\n?-    true.\n?- ', 'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL halt status is returned by the CLI',
       run: () => {
@@ -4550,7 +4603,7 @@ answer(ok) :-
         const program = Program.parse('answer(X) :- member(X, [a]), between(1, 1, _).\n');
         assertEqual(program.autoloadedPredicates.length, 2, 'autoloaded predicate count');
         assertEqual(program.autoloadedPredicates.map((entry) => `${entry.indicator}:${entry.library}`).sort().join(','),
-          'between/3:prologue,member/2:lists', 'autoload mapping');
+          'between/3:between,member/2:lists', 'autoload mapping');
         assertEqual(program.interopPortabilityWarnings.length, 0, 'autoloaded portable calls are warning-free');
       },
     },
@@ -5034,9 +5087,9 @@ answer(ok) :-
         assertEqual(registeredNativeEyePrologLibraryNames().length, 49, 'public native EyeProlog builtin count');
         assertEqual(eyePrologPortableLibraryIndicators.length, 87, 'portable Prolog library count');
         assertEqual(eyePrologInteropLibraryIndicators.length, 30, 'cross-implementation interop profile count');
-        assertEqual(eyePrologInteropLibraryModules.join(','), 'lists,iso_ext,lambda,atts', 'common explicit library module profile');
+        assertEqual(eyePrologInteropLibraryModules.join(','), 'lists,iso_ext,lambda,atts,freeze', 'common explicit library module profile');
         assertEqual(eyePrologInteropAutoload['member/2'], 'lists', 'member/2 canonical autoload');
-        assertEqual(eyePrologInteropAutoload['between/3'], 'prologue', 'between/3 canonical internal autoload');
+        assertEqual(eyePrologInteropAutoload['between/3'], 'between', 'between/3 canonical internal autoload');
         assertEqual(eyePrologInteropAutoload['call_nth/2'], 'iso_ext', 'call_nth/2 canonical interop autoload');
         assertEqual(eyePrologInteropAutoload['call_residue_vars/2'], 'atts', 'call_residue_vars/2 canonical interop autoload');
         assertEqual(eyePrologInteropAutoload['time/1'], 'iso_ext', 'time/1 canonical interop autoload');
@@ -5097,13 +5150,41 @@ answer(ok) :-
         assertEqual(program.findGroup('random', 3)?.module, 'random', 'random/3 is imported from library(random)');
       },
     },
+    {
+      name: 'Prologue facade re-exports canonical library predicates without conflicts',
+      run: () => {
+        const sources = [
+          ':- use_module(library(freeze)).\n:- use_module(library(lists)).\n:- use_module(library(iso_ext)).\n:- use_module(library(prologue)).',
+          ':- use_module(library(prologue)).\n:- use_module(library(freeze)).\n:- use_module(library(lists)).\n:- use_module(library(iso_ext)).',
+        ];
+        for (const source of sources) {
+          const program = Program.parse(source);
+          assertEqual(program.findGroup('freeze', 2)?.module, 'freeze', 'freeze/2 canonical owner');
+          assertEqual(program.findGroup('member', 2)?.module, 'lists', 'member/2 canonical owner');
+          assertEqual(program.findGroup('call_nth', 2)?.module, 'iso_ext', 'call_nth/2 canonical owner');
+          assertEqual(program.findGroup('between', 3)?.module, 'between', 'between/3 canonical owner');
+        }
+
+        const conflicting = new Program();
+        conflicting.defineModule('first', [{ name: 'shared', arity: 1 }]);
+        conflicting.defineModule('second', [{ name: 'shared', arity: 1 }]);
+        conflicting.importModule('user', 'first');
+        let conflict = null;
+        try {
+          conflicting.importModule('user', 'second');
+        } catch (error) {
+          conflict = error;
+        }
+        assertEqual(conflict?.formal, 'permission_error(import, procedure)', 'distinct implementations still conflict');
+      },
+    },
     {
       name: 'aligned bundled libraries have no overlapping full-module exports',
       run: () => {
         const owners = new Map();
         for (const [moduleName, entry] of standardLibrarySources) {
-          // library(prologue) is the documented legacy compatibility umbrella;
-          // aligned libraries must remain pairwise collision-free so full
+          // library(prologue) is a facade whose nominal exports are re-exports;
+          // canonical libraries must remain pairwise collision-free so full
           // use_module/1 imports can be combined safely.
           if (moduleName === 'prologue') continue;
           const parsed = Program.parse(entry.source);
@@ -6525,7 +6606,7 @@ child.on('close', (status, signal) => {
 
 function runCli(args, options = {}) {
   return spawnSync(process.execPath, [bin, ...args], {
-    cwd: packageRoot,
+    cwd: options.cwd ?? packageRoot,
     encoding: 'utf8',
     env: options.env ? { ...process.env, ...options.env } : process.env,
     input: options.input ?? undefined,

package/test/test-support.mjs

@@ -10,7 +10,7 @@ const standardModulePrelude = `:- use_module(library(aggregate)).
 :- use_module(library(iso_ext)).
 :- use_module(library(lists)).
 :- use_module(library(primes)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(random)).
 :- use_module(library(strings)).
 :- use_module(library(uuid)).