eyeprolog 1.3.76 → 1.3.77

package/README.md

@@ -335,10 +335,11 @@ may be imported explicitly, while source/CLI/API dependency loading can resolve
 their unqualified forms conservatively. For Trealla-style interactive timing,
 `time/1` is also available directly in the normal EyeProlog runtime; strict ISO
 mode does not expose it.
-The aligned `library(lists)` and `library(iso_ext)` exports are kept disjoint so
-they can be imported together without an accidental import conflict. EyeProlog's
-legacy `library(prologue)` remains a compatibility umbrella and should be
-selectively imported when mixed with the aligned modules.
+`library(lists)`, `library(iso_ext)`, and `library(freeze)` follow the focused
+module organization used by Trealla and Scryer. EyeProlog's legacy
+`library(prologue)` is now a compatibility facade over these canonical modules
+and `library(between)`, so it can be imported before or after the focused
+libraries without duplicate-import errors.
 
 `library(lambda)` follows Scryer's higher-order lambda notation, adapted from
 Ulrich Neumerkel's permissively licensed implementation. Importing it installs
@@ -362,8 +363,7 @@ Outside `--iso-strict`, an otherwise undefined unqualified call may autoload a
 predicate only when the interop profile has one canonical EyeProlog provider.
 For example, `member/2` autoloads from `library(lists)`, `call_nth/2` from
 `library(iso_ext)`, `call_residue_vars/2` from `library(atts)`, and `between/3`
-from EyeProlog's internal
-`library(prologue)` implementation. Use `--no-autoload` to disable this
+from `library(between)`. Use `--no-autoload` to disable this
 convenience. Strict ISO mode never autoloads library predicates.
 
 Use `-w` / `--warnings` to diagnose dependencies outside the interop profile,

package/examples/binomial-vandermonde.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Binomial coefficients and Vandermonde's identity.
 %

package/examples/book/chapter-26/02-triple.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 26 — Answers are existential witnesses.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 triple(A, B, C) :-

package/examples/book/chapter-28/02-triangle.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 28 — Symmetry reduces search.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 triangle(A, B, C) :-

package/examples/book/chapter-28/04-integer_rectangle.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 28.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 integer_rectangle(Area, W, H) :-

package/examples/book/chapter-29/01-counterexample_to_odd_square.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 29 — Examples suggest; proofs compel.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 counterexample_to_odd_square(N) :-

package/examples/book/chapter-31/03-double.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 31 — Properties over finite domains.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 double(N, D) :- (D is N + N).

package/examples/book/chapter-32/04-reference_square.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 32 — Compare specification and implementation.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 reference_square(N, S) :-

package/examples/book/chapter-33/03-chosen_pair.pl

@@ -1,5 +1,5 @@
 % From The Art of EyeProlog, Chapter 33 — Pattern 3: Generate, constrain, describe.
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 chosen_pair(pair(X, Y), reason(sum_is_ten)) :-

package/examples/book/chapter-39/01-answer.pl

@@ -1,6 +1,6 @@
 % From The Art of EyeProlog, Chapter 39 — The EyeProlog library.
 :- use_module(library(dates)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(random)).
 :- use_module(library(lists)).
 

package/examples/catalan-convolution.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Catalan numbers by automatically tabled convolution.
 %

package/examples/collatz-1000.pl

@@ -1,4 +1,4 @@
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Collatz conjecture suite translated from Eyeling's examples/collatz-1000.n3.
 % It enumerates starts N = 1000, 999, ..., 1 by deriving N = 1000 - N0

package/examples/continued-fraction-sqrt2.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Convergents of sqrt(2) by automatically tabled recurrence.
 %

package/examples/easter-computus.pl

@@ -1,4 +1,4 @@
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Gregorian Easter computus adapted from Eyeling's easter.n3.
 % Each case is a year in a sample decade.  The rules derive the Meeus/Jones/

package/examples/equality-saturation.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/examples/goldbach.pl

@@ -1,5 +1,5 @@
 :- use_module(library(primes)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Goldbach's_conjecture
 % See https://en.wikipedia.org/wiki/Goldbach%27s_conjecture:

package/examples/integer-partitions.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Integer partition counts by tabled dynamic programming.
 %

package/examples/job-shop-scheduling.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/examples/matrix-chain-order.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/examples/missionaries-cannibals.pl

@@ -1,4 +1,4 @@
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/examples/pell-equation.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Pell equation x^2 - 2y^2 = 1 by automatically tabled recurrence.
 %

package/examples/polynomial.pl

@@ -1,4 +1,4 @@
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 % Polynomial roots over complex integer candidates, adapted from Eyelet's

package/examples/prime-range.pl

@@ -1,4 +1,4 @@
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/examples/stirling-bell-numbers.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 
 % Stirling numbers of the second kind and Bell numbers.
 %

package/examples/totient-summatory.pl

@@ -1,5 +1,5 @@
 :- use_module(library(aggregate)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 :- use_module(library(iso_ext)).
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.76",
+  "version": "1.3.77",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/iso.js

@@ -1586,23 +1586,39 @@ function readTermFromStream(stream, solver) {
   let requestedInteractiveTerm = false;
   while (true) {
     let sawCandidate = false;
-    for (const candidate of termTextCandidates(stream, solver)) {
-      sawCandidate = true;
-      if (candidate.lexicalError) {
-        stream.position = candidate.end;
-        throw new PrologError('syntax_error(read_term)');
-      }
-      try {
-        const term = parseReadTermText(candidate.text, solver);
-        stream.position = candidate.end;
-        return scopeReadTerm(term);
-      } catch (error) {
-        if (error instanceof NumberRepresentationError || error instanceof CharacterRepresentationError) {
-          throw new PrologError(error.formal);
+    let lastCandidateEnd = stream.position;
+    try {
+      for (const candidate of termTextCandidates(stream, solver)) {
+        sawCandidate = true;
+        lastCandidateEnd = candidate.end;
+        if (candidate.lexicalError) {
+          stream.position = candidate.end;
+          throw new PrologError('syntax_error(read_term)');
+        }
+        try {
+          const term = parseReadTermText(candidate.text, solver);
+          stream.position = candidate.end;
+          return scopeReadTerm(term);
+        } catch (error) {
+          if (error instanceof NumberRepresentationError || error instanceof CharacterRepresentationError) {
+            throw new PrologError(error.formal);
+          }
+          // A dot inside a graphic operator, such as =.., is only a possible
+          // terminator. Keep scanning until a complete term parses.
         }
-        // A dot inside a graphic operator, such as =.., is only a possible
-        // terminator. Keep scanning until a complete term parses.
       }
+    } catch (error) {
+      // A synthetic input boundary uses an invalid-character sentinel after
+      // the required peek character. If a complete candidate already ended
+      // at that boundary but did not parse, the term itself is malformed;
+      // consume it and report syntax_error rather than blaming the sentinel.
+      if (sawCandidate && Number.isInteger(stream.syntheticInputBoundary) &&
+          lastCandidateEnd === stream.syntheticInputBoundary && error?.name === 'PrologError' &&
+          error.formal === 'representation_error(character)') {
+        stream.position = lastCandidateEnd;
+        throw new PrologError('syntax_error(read_term)');
+      }
+      throw error;
     }
 
     // The interactive top level may attach a synchronous reader to the

package/src/lib/lists.pl

@@ -111,16 +111,23 @@ same_length([_|Xs], [_|Ys]) :- same_length(Xs, Ys).
 
 nth0(N, List, Elem) :- nth0(N, List, Elem, _).
 
-nth0(0, [Elem|Rest], Elem, Rest).
-nth0(N, [X|Xs], Elem, [X|Rest]) :-
+nth0(N, List, Elem, Rest) :-
+    lists__integer_or_variable(N),
+    ( var(N) -> lists__nth0(N, List, Elem, Rest)
+    ; lists__not_less_than_zero(N),
+      lists__nth0(N, List, Elem, Rest)
+    ).
+
+lists__nth0(0, [Elem|Rest], Elem, Rest).
+lists__nth0(N, [X|Xs], Elem, [X|Rest]) :-
     var(N),
-    nth0(N0, Xs, Elem, Rest),
+    lists__nth0(N0, Xs, Elem, Rest),
     N is N0 + 1.
-nth0(N, [X|Xs], Elem, [X|Rest]) :-
+lists__nth0(N, [X|Xs], Elem, [X|Rest]) :-
     nonvar(N),
     N > 0,
     N0 is N - 1,
-    nth0(N0, Xs, Elem, Rest).
+    lists__nth0(N0, Xs, Elem, Rest).
 
 nth1(N, List, Elem) :- nth1(N, List, Elem, _).
 
@@ -208,6 +215,9 @@ lists__integer(X) :- var(X), !, 0 is X.
 % arg/3 performs the ISO integer type check before inspecting its term.
 lists__integer(X) :- arg(X, type_check, _).
 
+lists__integer_or_variable(X) :- var(X), !.
+lists__integer_or_variable(X) :- lists__integer(X).
+
 lists__not_less_than_zero(X) :- X >= 0, !.
 % atom_length/2 reports domain_error(not_less_than_zero) for a negative value.
 lists__not_less_than_zero(X) :- atom_length('', X).

package/src/lib/prologue.pl

@@ -1,4 +1,10 @@
-/** Predicates proposed by the ISO Prolog Prologue working draft. */
+/** Predicates proposed by the ISO Prolog Prologue working draft.
+
+    This legacy compatibility module is a facade over the canonical library
+    organization shared with Scryer and Trealla. Keeping one implementation
+    owner per predicate lets applications combine library(prologue) with the
+    specialized libraries without import conflicts.
+*/
 
 :- module(prologue, [
     member/2,
@@ -26,168 +32,26 @@
     countall/2
 ]).
 
-:- meta_predicate(maplist(1, '?')).
-:- meta_predicate(maplist(2, '?', '?')).
-:- meta_predicate(maplist(3, '?', '?', '?')).
-:- meta_predicate(maplist(4, '?', '?', '?', '?')).
-:- meta_predicate(maplist(5, '?', '?', '?', '?', '?')).
-:- meta_predicate(maplist(6, '?', '?', '?', '?', '?', '?')).
-:- meta_predicate(maplist(7, '?', '?', '?', '?', '?', '?', '?')).
-:- meta_predicate(call_nth(0, '?')).
-:- meta_predicate(freeze('?', 0)).
-:- meta_predicate(foldl(3, '?', '?', '?')).
-:- meta_predicate(foldl(4, '?', '?', '?', '?')).
-:- meta_predicate(foldl(5, '?', '?', '?', '?', '?')).
-:- meta_predicate(countall(0, '?')).
-
-member(X, [X|_]).
-member(X, [_|Xs]) :- member(X, Xs).
-
-append([], Ys, Ys).
-append([X|Xs], Ys, [X|Zs]) :- append(Xs, Ys, Zs).
-
-length(List, Length) :-
-    nonvar(Length), !,
-    prologue__integer(Length),
-    prologue__not_less_than_zero(Length),
-    prologue__length_fixed(Length, List).
-length(List, Length) :-
-    prologue__length_generate(List, 0, Length).
-
-prologue__length_fixed(0, []).
-prologue__length_fixed(N, [_|Xs]) :-
-    N > 0,
-    Next is N - 1,
-    prologue__length_fixed(Next, Xs).
-
-prologue__length_generate([], N, N).
-prologue__length_generate([_|Xs], N0, N) :-
-    N1 is N0 + 1,
-    prologue__length_generate(Xs, N1, N).
-
-between(Lower, Upper, X) :-
-    prologue__integer(Lower),
-    prologue__integer(Upper),
-    prologue__integer_or_variable(X),
-    prologue__between(Lower, Upper, X).
-
-prologue__between(Lower, Upper, Lower) :- Lower =< Upper.
-prologue__between(Lower, Upper, X) :-
-    Lower < Upper,
-    Next is Lower + 1,
-    prologue__between(Next, Upper, X).
-
-select(X, [X|Xs], Xs).
-select(X, [Y|Ys], [Y|Zs]) :- select(X, Ys, Zs).
-
-succ(X, S) :-
-    var(X), !,
-    ( var(S) -> 0 is S
-    ; prologue__integer(S),
-      prologue__not_less_than_zero(S),
-      S > 0,
-      X is S - 1
-    ).
-succ(X, S) :-
-    prologue__integer(X),
-    prologue__not_less_than_zero(X),
-    ( var(S) -> S is X + 1
-    ; prologue__integer(S),
-      prologue__not_less_than_zero(S),
-      S =:= X + 1
-    ).
-
-maplist(_, []).
-maplist(Closure, [X|Xs]) :-
-    call(Closure, X),
-    maplist(Closure, Xs).
-
-maplist(_, [], []).
-maplist(Closure, [A|As], [B|Bs]) :-
-    call(Closure, A, B),
-    maplist(Closure, As, Bs).
-
-maplist(_, [], [], []).
-maplist(Closure, [A|As], [B|Bs], [C|Cs]) :-
-    call(Closure, A, B, C),
-    maplist(Closure, As, Bs, Cs).
-
-maplist(_, [], [], [], []).
-maplist(Closure, [A|As], [B|Bs], [C|Cs], [D|Ds]) :-
-    call(Closure, A, B, C, D),
-    maplist(Closure, As, Bs, Cs, Ds).
-
-maplist(_, [], [], [], [], []).
-maplist(Closure, [A|As], [B|Bs], [C|Cs], [D|Ds], [E|Es]) :-
-    call(Closure, A, B, C, D, E),
-    maplist(Closure, As, Bs, Cs, Ds, Es).
-
-maplist(_, [], [], [], [], [], []).
-maplist(Closure, [A|As], [B|Bs], [C|Cs], [D|Ds], [E|Es], [F|Fs]) :-
-    call(Closure, A, B, C, D, E, F),
-    maplist(Closure, As, Bs, Cs, Ds, Es, Fs).
-
-maplist(_, [], [], [], [], [], [], []).
-maplist(Closure, [A|As], [B|Bs], [C|Cs], [D|Ds], [E|Es], [F|Fs], [G|Gs]) :-
-    call(Closure, A, B, C, D, E, F, G),
-    maplist(Closure, As, Bs, Cs, Ds, Es, Fs, Gs).
-
-nth0(N, List, Elem) :- nth0(N, List, Elem, _).
-
-nth0(N, List, Elem, Rest) :-
-    prologue__integer_or_variable(N),
-    ( var(N) -> prologue__nth0(N, List, Elem, Rest)
-    ; prologue__not_less_than_zero(N),
-      prologue__nth0(N, List, Elem, Rest)
-    ).
-
-prologue__nth0(0, [Elem|Rest], Elem, Rest).
-prologue__nth0(N, [X|Xs], Elem, [X|Rest]) :-
-    var(N),
-    prologue__nth0(N0, Xs, Elem, Rest),
-    N is N0 + 1.
-prologue__nth0(N, [X|Xs], Elem, [X|Rest]) :-
-    nonvar(N),
-    N > 0,
-    N0 is N - 1,
-    prologue__nth0(N0, Xs, Elem, Rest).
-
-nth1(N, List, Elem) :- nth1(N, List, Elem, _).
-
-nth1(N, List, Elem, Rest) :-
-    N \== 0,
-    nth0(N, [_|List], Elem, [_|Rest]),
-    N \== 0.
-
-call_nth(Goal, Nth) :- eyeprolog__call_nth(Goal, Nth).
-
-freeze(Var, Goal) :- eyeprolog__freeze(Var, Goal).
-
-foldl(_, [], Acc, Acc).
-foldl(Closure, [A|As], Acc0, Acc) :-
-    call(Closure, A, Acc0, Acc1),
-    foldl(Closure, As, Acc1, Acc).
-
-foldl(_, [], [], Acc, Acc).
-foldl(Closure, [A|As], [B|Bs], Acc0, Acc) :-
-    call(Closure, A, B, Acc0, Acc1),
-    foldl(Closure, As, Bs, Acc1, Acc).
-
-foldl(_, [], [], [], Acc, Acc).
-foldl(Closure, [A|As], [B|Bs], [C|Cs], Acc0, Acc) :-
-    call(Closure, A, B, C, Acc0, Acc1),
-    foldl(Closure, As, Bs, Cs, Acc1, Acc).
-
-countall(Goal, Count) :- eyeprolog__countall(Goal, Count).
-
-prologue__integer_or_variable(X) :- var(X), !.
-prologue__integer_or_variable(X) :- prologue__integer(X).
-
-prologue__integer(X) :- integer(X), !.
-prologue__integer(X) :- var(X), !, 0 is X.
-% arg/3 performs the required integer type check before inspecting its term.
-prologue__integer(X) :- arg(X, type_check, _).
-
-prologue__not_less_than_zero(X) :- X >= 0, !.
-% atom_length/2 reports domain_error(not_less_than_zero) for a negative value.
-prologue__not_less_than_zero(X) :- atom_length('', X).
+:- use_module(library(lists), [
+    member/2,
+    append/3,
+    length/2,
+    select/3,
+    maplist/2,
+    maplist/3,
+    maplist/4,
+    maplist/5,
+    maplist/6,
+    maplist/7,
+    maplist/8,
+    nth0/3,
+    nth0/4,
+    nth1/3,
+    nth1/4,
+    foldl/4,
+    foldl/5,
+    foldl/6
+]).
+:- use_module(library(between), [between/3]).
+:- use_module(library(iso_ext), [succ/2, call_nth/2, countall/2]).
+:- use_module(library(freeze), [freeze/2]).

package/src/program.js

@@ -180,12 +180,18 @@ export class Program {
     for (let i = 0; i < head.arity; i++) indexOne(group.argIndexes[i], head.args[i], clause, group.clauses, clausePosition);
   }
   findGroup(name, arity, module = 'user') {
-    const direct = this.groups.get(modulePredicateKey(module, name, arity));
-    if (direct) return direct;
-    const importedModule = this.moduleImports.get(module)?.get(`${name}/${arity}`);
-    return importedModule == null
-      ? null
-      : this.groups.get(modulePredicateKey(importedModule, name, arity)) ?? null;
+    const indicator = `${name}/${arity}`;
+    const visited = new Set();
+    let current = module;
+    while (!visited.has(current)) {
+      visited.add(current);
+      const direct = this.groups.get(modulePredicateKey(current, name, arity));
+      if (direct) return direct;
+      const importedModule = this.moduleImports.get(current)?.get(indicator);
+      if (importedModule == null) return null;
+      current = importedModule;
+    }
+    return null;
   }
   defineModule(name, exports, filename = '<input>') {
     const indicators = new Map(exports.map((indicator) => [`${indicator.name}/${indicator.arity}`, indicator]));
@@ -202,10 +208,16 @@ export class Program {
         throw new PrologError('existence_error(procedure)', compound('/', [atom(indicator.name), numberTerm(indicator.arity)]));
       }
       const previous = imports.get(key);
-      if (previous != null && previous !== source) {
+      const resolved = this.findGroup(indicator.name, indicator.arity, source);
+      const canonicalSource = resolved?.module ?? source;
+      const previousResolved = previous == null
+        ? null
+        : this.findGroup(indicator.name, indicator.arity, previous);
+      const canonicalPrevious = previousResolved?.module ?? previous;
+      if (previous != null && canonicalPrevious !== canonicalSource) {
         throw new PrologError('permission_error(import, procedure)', compound('/', [atom(indicator.name), numberTerm(indicator.arity)]));
       }
-      imports.set(key, source);
+      imports.set(key, canonicalSource);
     }
     this.moduleImports.set(target, imports);
   }

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

@@ -803,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;
@@ -811,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/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

@@ -1565,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: () => {
@@ -1825,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: () => {
@@ -2830,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: () => {
@@ -4566,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');
       },
     },
@@ -5050,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');
@@ -5113,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);
@@ -6541,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)).

package/the-art-of-eyeprolog.md

@@ -3568,7 +3568,7 @@ methods.
 Consider a relation for a Pythagorean triple:
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 triple(A, B, C) :-
@@ -3880,7 +3880,7 @@ permutations repeats the same geometric object six times. Ordering the sides
 removes the symmetry:
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 triangle(A, B, C) :-
@@ -3918,7 +3918,7 @@ it from width and height. With a finite generator it can also search for
 factorizations:
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 integer_rectangle(Area, W, H) :-
@@ -4031,7 +4031,7 @@ theorem over an unbounded domain.
 This boundary can be written directly:
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 counterexample_to_odd_square(N) :-
@@ -4470,7 +4470,7 @@ Examples test selected points. A finite generated property tests every point
 in a declared scope:
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 double(N, D) :- (D is N + N).
@@ -4724,7 +4724,7 @@ compare it with the optimized one. The reference may be slow; its purpose is
 clarity.
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 reference_square(N, S) :-
@@ -4865,7 +4865,7 @@ explanation until none can be reasoned about separately.
 in dependency order, then construct a witness or reason.
 
 ```eyeprolog
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(lists)).
 
 chosen_pair(pair(X, Y), reason(sum_is_ten)) :-
@@ -6222,17 +6222,23 @@ clauses over private adapters. `time/1` is additionally registered directly in
 the normal EyeProlog runtime so Trealla-style timing works at the interactive
 top level without an import; it is absent from the strict ISO registry.
 
-The sources are `src/lib/aggregate.pl`, `src/lib/atts.pl`, `src/lib/clpz.pl`, `src/lib/comparison.pl`,
-`src/lib/dates.pl`, `src/lib/iso_ext.pl`, `src/lib/lambda.pl`,
-`src/lib/lists.pl`, `src/lib/primes.pl`, `src/lib/prologue.pl`,
-`src/lib/random.pl`, `src/lib/strings.pl`, and `src/lib/uuid.pl`. Each declares a same-named module
+The sources are `src/lib/aggregate.pl`, `src/lib/arithmetic.pl`,
+`src/lib/assoc.pl`, `src/lib/atts.pl`, `src/lib/between.pl`,
+`src/lib/clpz.pl`, `src/lib/comparison.pl`, `src/lib/dates.pl`,
+`src/lib/dcgs.pl`, `src/lib/debug.pl`, `src/lib/error.pl`,
+`src/lib/format.pl`, `src/lib/freeze.pl`, `src/lib/iso_ext.pl`,
+`src/lib/lambda.pl`, `src/lib/lists.pl`, `src/lib/pairs.pl`,
+`src/lib/primes.pl`, `src/lib/prologue.pl`, `src/lib/random.pl`,
+`src/lib/si.pl`, `src/lib/strings.pl`, `src/lib/terms.pl`, and
+`src/lib/uuid.pl`. Each declares a same-named module
 with `module/2`; there is no catch-all `library(eyeprolog)`. A program imports
 only the modules it needs, and
 `use_module/2` can select an even smaller indicator list. The Prologue
-module implements p.p.1 through p.p.11 of the
+module exposes p.p.1 through p.p.11 of the
 [working-draft Prologue](https://www.complang.tuwien.ac.at/ulrich/iso-prolog/prologue),
-with the published Prologue, `call_nth/2`, and `length/2` quads retained as
-offline regressions. `src/standard-library.js` registers the module sources and private control and
+as a compatibility facade over the canonical `lists`, `between`, `iso_ext`,
+and `freeze` modules. The published Prologue, `call_nth/2`, and `length/2`
+quads are retained as offline regressions. `src/standard-library.js` registers the module sources and private control and
 constraint adapters for Node and browser resolution. Explicit `use_module/1-2`
 loads remain supported; outside strict ISO mode, the conservative interop
 autoloader may also load a module for one uniquely mapped common predicate.
@@ -6294,7 +6300,9 @@ The current interoperability profile recognizes these library roles:
 | `library(lists)` | Common list module. A conservative subset of its exports is in the shared predicate profile. |
 | `library(iso_ext)` | Common extension-module name. `call_nth/2`, `time/1`, and the `... //0` arbitrary-sequence helper are conservatively autoloaded for cross-engine source. |
 | `library(lambda)` | Scryer-aligned higher-order notation. It is imported explicitly because loading it also installs the `+\` operator. |
-| `library(prologue)` | EyeProlog compatibility module, not a common interop library name. `between/3` is nevertheless autoloaded from it so portable source need not name this EyeProlog-specific provider. |
+| `library(atts)` | Common attributed-variable interface used by constraint libraries. |
+| `library(freeze)` | Common delayed-goal module backed by attributed variables. |
+| `library(prologue)` | EyeProlog compatibility facade, not a common interop library name. Its exports resolve to canonical focused modules instead of duplicate implementations. |
 
 Other modules from the catalog, including `library(clpz)`, `library(strings)`,
 `library(random)`, and `library(uuid)`, remain normal EyeProlog libraries. They
@@ -6323,11 +6331,10 @@ for example `% Time elapsed 0.832s, 65551 Inferences, 0.079 MLips`; `... //0`
 describes an arbitrary number of input elements. Together they let the
 Trealla/Scryer DCG hand-off benchmark run in EyeProlog without source changes
 (assuming the usual list library is already imported in an interactive
-session). The interop exports of `library(lists)` and
-`library(iso_ext)` are kept disjoint, so both modules can be imported together
-without an accidental collision. `library(prologue)` remains a compatibility
-umbrella and overlaps them; use selective imports when legacy code combines it
-with the aligned modules.
+session). The focused modules have one canonical implementation owner per
+predicate. `library(prologue)` re-exports those same owners, so legacy code can
+combine the facade with `library(lists)`, `library(iso_ext)`, and
+`library(freeze)` in either import order without an accidental collision.
 
 `library(lambda)` follows Scryer's higher-order notation, adapted from Ulrich
 Neumerkel's permissively licensed implementation. Its public syntax is:
@@ -6372,7 +6379,7 @@ extension. For example, the canonical build-time providers are:
 | `call_nth/2` | `library(iso_ext)` |
 | `time/1` | `library(iso_ext)` |
 | `.../2` | `library(iso_ext)` |
-| `between/3` | `library(prologue)` |
+| `between/3` | `library(between)` |
 
 Predicates outside that table require an explicit import even when EyeProlog
 provides them. Explicit imports therefore remain the clearest way to state
@@ -6494,7 +6501,7 @@ before calling the corresponding predicate.
 
 ```eyeprolog
 :- use_module(library(dates)).
-:- use_module(library(prologue), [between/3]).
+:- use_module(library(between), [between/3]).
 :- use_module(library(random)).
 :- use_module(library(lists)).
 
@@ -6515,7 +6522,7 @@ expresses them: for example, `R is A + B`, `R is abs(A)`, and
 modulo, powers, sine, cosine, exponential, logarithm, and the ISO rounding
 functions.
 
-The bundled library layer defines `between/3` in `library(prologue)` and
+The bundled library layer defines `between/3` in `library(between)` and
 `smallest_divisor_from/3` in `library(primes)` as ordinary Prolog clauses.
 Choose the smaller or
 larger of two arithmetic values directly with ISO control, for example