@ohtaman/washi 0.4.0 → 0.5.0

package/dist/lib/solvers/z3.js

@@ -1,114 +1,98 @@
-import { i as e, r as t, t as n } from "../constraint-BRuB3ooC.js";
-import { r } from "../registry-DksqCSjI.js";
-import { getBundledZ3AssetUrls as i } from "./z3-assets.js";
+import { D as e, O as t, T as n, r, s as i } from "../registry-BEfvpZW3.js";
+import { getBundledZ3AssetUrls as a } from "./z3-assets.js";
 //#region src/modeler/solvers/z3/loader.ts
-var a = null, o = null, s = null, c = null, l = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set(), d = /* @__PURE__ */ new Set();
-function f(e) {
-	let t = e?.Semaphore || e?.default?.Semaphore;
-	if (!t || t.__washi_hooked) return;
-	t.__washi_hooked = !0;
-	let n = t.prototype.acquire;
-	t.prototype.acquire = function(...e) {
-		return d.add(this), n.apply(this, e);
-	};
-}
-import("../async-mutex-Duo4jwzn.js").then(f).catch(() => {});
-function p(e) {
-	for (let e of Array.from(d)) try {
-		if (typeof e.isLocked == "function" && e.isLocked()) {
-			if (typeof e.cancel == "function") try {
-				e.cancel();
-			} catch {}
-			if (typeof e.release == "function") try {
-				e.release();
-			} catch {}
-		}
+var o = null, s = null, c = null, l = null, u = /* @__PURE__ */ new WeakMap();
+function d(e, t) {
+	if (e.error) return;
+	let n = t instanceof Error ? t : /* @__PURE__ */ Error(`[WaSHI] Z3 internal worker error: ${typeof t == "object" && t && "message" in t ? String(t.message) : String(t)}`);
+	e.error = n;
+	for (let t of e.asyncRejects) t(n);
+	e.asyncRejects.clear(), l === e && _();
+	try {
+		e.instance?.em?.PThread?.terminateAllThreads();
 	} catch {}
+	e.bootstrapUrl && URL.revokeObjectURL(e.bootstrapUrl);
+	for (let t of Array.from(e.errorHandlers)) try {
+		t(n);
+	} catch {}
+	e.errorHandlers.clear();
 }
-function m(e) {
+function f(e, t) {
 	if (!e || e.__washi_async_call_hooked) return;
 	e.__washi_async_call_hooked = !0;
-	let t = e.async_call;
-	typeof t == "function" && (e.async_call = function(e, ...n) {
-		let r, i = new Promise((e, t) => {
-			r = t, u.add(t);
+	let n = e.async_call;
+	typeof n == "function" && (e.async_call = function(e, ...r) {
+		if (t.error) return Promise.reject(t.error);
+		let i, a = new Promise((e, n) => {
+			i = n, t.asyncRejects.add(n);
 		});
-		i.catch(() => {});
+		a.catch(() => {});
 		try {
-			let a = t.call(this, e, ...n);
-			return Promise.race([a, i]).finally(() => {
-				u.delete(r);
+			let o = n.call(this, e, ...r);
+			return Promise.race([o, a]).finally(() => {
+				t.asyncRejects.delete(i);
 			});
 		} catch (e) {
-			throw u.delete(r), g(e), e;
+			throw t.asyncRejects.delete(i), d(t, e), e;
 		}
 	});
 }
-function h(e) {
-	return l.add(e), () => {
-		l.delete(e);
-	};
+function p(e, t) {
+	let n = t ? u.get(t) : l;
+	return n ? n.error ? (e(n.error), () => {}) : (n.errorHandlers.add(e), () => {
+		n.errorHandlers.delete(e);
+	}) : () => {};
 }
-function g(e) {
-	let t = e instanceof Error ? e : /* @__PURE__ */ Error(`[WaSHI] Z3 internal worker error: ${e?.message || (typeof e == "string" ? e : "Worker failed to initialize or execute")}`);
-	for (let e of Array.from(u)) try {
-		e(t);
-	} catch {}
-	if (u.clear(), p(t), o?.em?.PThread?.terminateAllThreads) try {
-		o.em.PThread.terminateAllThreads();
-	} catch {}
-	y();
-	for (let e of Array.from(l)) try {
-		e(t);
-	} catch {}
+function m(e) {
+	l && d(l, e);
 }
-function _(e) {
+function h(e, t) {
 	if (!e || !e.PThread || e.PThread.__washi_monitored) return;
 	e.PThread.__washi_monitored = !0;
-	let t = (e) => {
+	let n = (e) => {
 		e && (e.onerror = (e) => {
-			g(e);
+			d(t, e);
 		}, typeof e.addEventListener == "function" && e.addEventListener("error", (e) => {
-			g(e), typeof e.preventDefault == "function" && e.preventDefault();
+			d(t, e), typeof e.preventDefault == "function" && e.preventDefault();
 		}));
 	};
-	Array.isArray(e.PThread.unusedWorkers) && e.PThread.unusedWorkers.forEach(t), Array.isArray(e.PThread.runningWorkers) && e.PThread.runningWorkers.forEach(t);
-	let n = e.PThread.loadWasmModuleToWorker;
-	typeof n == "function" && (e.PThread.loadWasmModuleToWorker = function(e) {
+	Array.isArray(e.PThread.unusedWorkers) && e.PThread.unusedWorkers.forEach(n), Array.isArray(e.PThread.runningWorkers) && e.PThread.runningWorkers.forEach(n);
+	let r = e.PThread.loadWasmModuleToWorker;
+	typeof r == "function" && (e.PThread.loadWasmModuleToWorker = function(e) {
 		try {
-			let t = n.call(this, e);
+			let n = r.call(this, e);
 			return e.onerror = (e) => {
-				g(e);
-			}, t;
+				d(t, e);
+			}, n;
 		} catch (e) {
-			throw g(e), e;
+			throw d(t, e), e;
 		}
 	});
-	let r = e.PThread.allocateUnusedWorker;
-	typeof r == "function" && (e.PThread.allocateUnusedWorker = function() {
+	let i = e.PThread.allocateUnusedWorker;
+	typeof i == "function" && (e.PThread.allocateUnusedWorker = function() {
 		try {
-			r.call(this);
+			i.call(this);
 			let e = this.unusedWorkers?.[this.unusedWorkers.length - 1];
-			e && t(e);
+			e && n(e);
 		} catch (e) {
-			throw g(e), e;
+			throw d(t, e), e;
 		}
 	});
 }
-function v(e) {
-	e.jsUrl !== void 0 && (s = e.jsUrl), e.wasmUrl !== void 0 && (c = e.wasmUrl), y();
+function g(e) {
+	e.jsUrl !== void 0 && (s = e.jsUrl), e.wasmUrl !== void 0 && (c = e.wasmUrl), _();
 }
-function y() {
-	a = null, o = null;
+function _() {
+	o = null, l = null;
 }
-function b() {
+function v() {
 	if (typeof window > "u") return;
 	let e = window.location.hostname === "localhost" || window.location.hostname === "127.0.0.1" || window.location.hostname === "[::1]";
 	if (!window.isSecureContext && !e) throw Error(`[WaSHI] Z3 solver requires a Secure Context (HTTPS or localhost). Current protocol: "${window.location.protocol}".`);
 	let t = typeof SharedArrayBuffer < "u", n = window.crossOriginIsolated === !0;
 	if (!t || !n) throw Error("[WaSHI] Z3 solver requires SharedArrayBuffer and crossOriginIsolated in browser environments.\nEnsure your server sends the following delivery headers on the document response:\n  Cross-Origin-Opener-Policy: same-origin\n  Cross-Origin-Embedder-Policy: require-corp\n(Note: Standard CORS headers alone are not sufficient, and setting 'useWorker: false' does not remove Z3's internal multithreading requirement.)");
 }
-async function x(e, t) {
+async function y(e, t) {
 	try {
 		let n = null;
 		try {
@@ -125,7 +109,7 @@ async function x(e, t) {
 		throw Error(`[WaSHI] Failed to load Z3 asset (${t}) from "${e}": ${n.message || String(n)}. Deploy local assets with correct MIME types; no CDN fallback is attempted.`, { cause: n });
 	}
 }
-function S(e = {}) {
+function b(e = {}) {
 	if (e.z3JsUrl && e.z3WasmUrl) return {
 		jsUrl: e.z3JsUrl,
 		wasmUrl: e.z3WasmUrl
@@ -134,13 +118,13 @@ function S(e = {}) {
 		jsUrl: e.z3JsUrl || s,
 		wasmUrl: e.z3WasmUrl || c
 	};
-	let t = i();
+	let t = a();
 	return {
 		jsUrl: e.z3JsUrl || s || t.jsUrl,
 		wasmUrl: e.z3WasmUrl || c || t.wasmUrl
 	};
 }
-async function C(e) {
+async function x(e) {
 	let t = globalThis;
 	if (t.global === void 0 && (t.global = t), typeof t.initZ3 == "function") return t.initZ3;
 	if (typeof document < "u") await new Promise((n, r) => {
@@ -172,165 +156,183 @@ async function C(e) {
 	if (typeof t.initZ3 != "function") throw Error(`[WaSHI] Script loaded from "${e}" did not define global initZ3.`);
 	return t.initZ3;
 }
-async function w(e = {}) {
-	if (a) return a;
-	let t = typeof process < "u" && process.versions && process.versions.node && process.type !== "renderer", n = (async () => {
-		if (t) try {
-			let e = await import("z3-solver");
+async function S(e = {}) {
+	if (o) return o;
+	let t = {
+		instance: null,
+		error: null,
+		errorHandlers: /* @__PURE__ */ new Set(),
+		asyncRejects: /* @__PURE__ */ new Set()
+	};
+	l = t;
+	async function n(e) {
+		if (t.error) throw t.error;
+		let n = await e();
+		if (t.instance = n, u.set(n, t), t.error) {
 			try {
-				f(await import("../async-mutex-Duo4jwzn.js"));
+				n.em?.PThread?.terminateAllThreads();
 			} catch {}
-			let t = await e.init();
-			return o = t, t && t.em && (_(t.em), m(t.em)), t;
+			throw t.error;
+		}
+		return n.em && (h(n.em, t), f(n.em, t)), n;
+	}
+	let r, i = new Promise((e, t) => {
+		r = t;
+	});
+	t.errorHandlers.add(r);
+	let a = typeof process < "u" && process.versions && process.versions.node && process.type !== "renderer", s = (async () => {
+		if (a) try {
+			let e = await import("z3-solver");
+			return await n(() => e.init());
 		} catch (e) {
 			throw Error(`[WaSHI] Failed to load z3-solver. Ensure the optional dependency is installed (npm install z3-solver) and supported in this environment. Error: ${e instanceof Error ? e.message : String(e)}`, { cause: e });
 		}
-		b();
-		let { jsUrl: n, wasmUrl: r } = S(e);
-		await x(n, "JavaScript (z3-built.js)"), await x(r, "WebAssembly (z3-built.wasm)"), await C(n);
-		let i = n;
-		if (typeof window < "u" && new URL(n).origin !== window.location.origin) {
-			let e = new Blob([`importScripts(${JSON.stringify(n)});`], { type: "application/javascript" });
-			i = URL.createObjectURL(e);
-		}
-		let a = {
-			locateFile: (e) => e.endsWith(".wasm") ? r : new URL(e, n).href,
-			mainScriptUrlOrBlob: i
+		v();
+		let { jsUrl: r, wasmUrl: i } = b(e);
+		if (await y(r, "JavaScript (z3-built.js)"), await y(i, "WebAssembly (z3-built.wasm)"), await x(r), t.error) throw t.error;
+		let o = r;
+		if (typeof window < "u" && new URL(r).origin !== window.location.origin) {
+			let e = new Blob([`importScripts(${JSON.stringify(r)});`], { type: "application/javascript" });
+			o = URL.createObjectURL(e), t.bootstrapUrl = o;
+		}
+		let s = {
+			locateFile: (e) => e.endsWith(".wasm") ? i : new URL(e, r).href,
+			mainScriptUrlOrBlob: o
 		};
 		try {
 			let e = await import("z3-solver");
-			try {
-				f(await import("../async-mutex-Duo4jwzn.js"));
-			} catch {}
-			let t, n = await new Promise((n, r) => {
-				t = h(r), e.init(a).then(n, r);
-			}).finally(() => t?.());
-			return o = n, n && n.em && (_(n.em), m(n.em)), n;
+			return await n(() => e.init(s));
 		} catch (e) {
-			throw y(), Error(`[WaSHI] Failed to initialize Z3 in browser: ${e?.message || String(e)}`, { cause: e });
+			throw Error(`[WaSHI] Failed to initialize Z3 in browser: ${e?.message || String(e)}`, { cause: e });
 		}
-	})();
-	return n.catch(() => {
-		a === n && y();
-	}), a = n, n;
+	})(), c = Promise.race([s, i]).finally(() => {
+		t.errorHandlers.delete(r);
+	});
+	return c.catch((e) => d(t, e)), o = c, c;
 }
-async function T(e) {
-	let t = e || o || (a ? await a.catch(() => null) : null);
-	p();
-	for (let e of Array.from(u)) try {
-		e(/* @__PURE__ */ Error("[WaSHI] Z3 threads terminated"));
-	} catch {}
-	if (u.clear(), !t || !t.em) {
-		y();
-		return;
-	}
-	try {
+async function C(e) {
+	let t = e ? u.get(e) : l, n = e || t?.instance;
+	if (t && d(t, /* @__PURE__ */ Error("[WaSHI] Z3 threads terminated")), n?.em) try {
 		let { killThreads: e } = await import("z3-solver");
-		typeof e == "function" ? await e(t.em) : t.em?.PThread?.terminateAllThreads && t.em.PThread.terminateAllThreads();
+		typeof e == "function" ? await e(n.em) : n.em.PThread?.terminateAllThreads();
 	} catch {
-		t.em?.PThread?.terminateAllThreads && t.em.PThread.terminateAllThreads();
-	} finally {
-		y();
+		n.em.PThread?.terminateAllThreads();
 	}
 }
 //#endregion
 //#region src/modeler/solvers/z3/solver.ts
-var E = class {
+function w(e, t, n) {
+	Object.defineProperty(e, t, {
+		value: n,
+		enumerable: !0,
+		writable: !0,
+		configurable: !0
+	});
+}
+var T = class {
 	name = "z3";
 	capabilities = {
 		supportsMIP: !0,
 		supportsQP: !1,
 		supportsSMT: !0,
-		supportsUnsatCore: !0
+		supportsUnsatCore: !0,
+		supportsWarmStart: !1
 	};
 	createContextTranslator(r) {
-		let i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
-		function o(e) {
-			if (!i.has(e.name)) {
-				let t = e.type === "Continuous" || e.type === "CONTINUOUS" ? r.Real.const(e.name) : r.Int.const(e.name);
-				i.set(e.name, t);
+		let i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set();
+		function s(e, t) {
+			let n = e || t, r = n, i = 1;
+			for (; o.has(r);) r = `${n}__${i++}`;
+			return o.add(r), r;
+		}
+		function c(e) {
+			let t = i.get(e);
+			if (!t) {
+				let n = s(e.name, `v_${e.id ?? i.size}`);
+				t = e.type === "Continuous" || e.type === "CONTINUOUS" ? r.Real.const(n) : r.Int.const(n), i.set(e, t);
 			}
-			return i.get(e.name);
+			return t;
 		}
-		function s(e) {
-			if (!a.has(e.name)) {
-				let t = r.Bool.const(e.name);
-				a.set(e.name, t);
+		function l(e) {
+			let t = a.get(e);
+			if (!t) {
+				let n = s(e.name, `b_${e.id ?? a.size}`);
+				t = r.Bool.const(n), a.set(e, t);
 			}
-			return a.get(e.name);
+			return t;
 		}
-		function c(e) {
+		function u(e) {
 			return typeof r.isInt == "function" && r.isInt(e) ? r.ToReal(e) : e;
 		}
-		function l(e, t) {
+		function d(e, t) {
 			let n = typeof r.isInt == "function" && r.isInt(e), i = typeof r.isInt == "function" && r.isInt(t);
-			return n && i ? e.add(t) : c(e).add(c(t));
+			return n && i ? e.add(t) : u(e).add(u(t));
 		}
-		function u(e, t) {
-			return typeof r.isInt == "function" && r.isInt(e) && Number.isInteger(t) ? e.mul(r.Int.val(t)) : c(e).mul(r.Real.val(t));
+		function f(e, t) {
+			return typeof r.isInt == "function" && r.isInt(e) && Number.isInteger(t) ? e.mul(r.Int.val(t)) : u(e).mul(r.Real.val(t));
 		}
-		function d(e, t) {
+		function p(e, t) {
 			let n = typeof r.isInt == "function" && r.isInt(e), i = typeof r.isInt == "function" && r.isInt(t);
-			return n && i ? e.mul(t) : c(e).mul(c(t));
+			return n && i ? e.mul(t) : u(e).mul(u(t));
 		}
-		function f(e, t) {
+		function m(e, t) {
 			return t && Number.isInteger(e) ? r.Int.val(e) : r.Real.val(e);
 		}
-		function p(e, t, n) {
-			let i = typeof r.isInt == "function" && r.isInt(e) && Number.isInteger(n), a = i ? e : c(e), o = i ? r.Int.val(n) : r.Real.val(n);
+		function h(e, t, n) {
+			let i = typeof r.isInt == "function" && r.isInt(e) && Number.isInteger(n), a = i ? e : u(e), o = i ? r.Int.val(n) : r.Real.val(n);
 			return t === "<=" ? a.le(o) : t === ">=" ? a.ge(o) : a.eq(o);
 		}
-		function m(e) {
+		function g(e) {
 			let t = null;
 			if (e && e.terms) for (let [n, r] of e.terms.entries()) {
-				let e = u(o(n), r);
-				t = t === null ? e : l(t, e);
+				let e = f(c(n), r);
+				t = t === null ? e : d(t, e);
 			}
 			let n = e && typeof e.constant == "number" ? e.constant : 0;
 			if (n !== 0 || t === null) {
-				let e = f(n, t === null || typeof r.isInt == "function" && r.isInt(t));
-				t = t === null ? e : l(t, e);
+				let e = m(n, t === null || typeof r.isInt == "function" && r.isInt(t));
+				t = t === null ? e : d(t, e);
 			}
 			return t;
 		}
-		function h(e) {
+		function _(e) {
 			let t = null;
 			if (e.linearTerms) for (let [n, r] of e.linearTerms.entries()) {
-				let e = u(o(n), r);
-				t = t === null ? e : l(t, e);
+				let e = f(c(n), r);
+				t = t === null ? e : d(t, e);
 			}
 			if (e.quadTerms) for (let n of e.quadTerms.values()) {
-				let e = u(d(o(n.var1), o(n.var2)), n.coeff);
-				t = t === null ? e : l(t, e);
+				let e = f(p(c(n.var1), c(n.var2)), n.coeff);
+				t = t === null ? e : d(t, e);
 			}
 			let n = e && typeof e.constant == "number" ? e.constant : 0;
 			if (n !== 0 || t === null) {
-				let e = f(n, t === null || typeof r.isInt == "function" && r.isInt(t));
-				t = t === null ? e : l(t, e);
+				let e = m(n, t === null || typeof r.isInt == "function" && r.isInt(t));
+				t = t === null ? e : d(t, e);
 			}
 			return t;
 		}
-		function g(e) {
-			let t = e.lhs instanceof Object && "quadTerms" in e.lhs ? h(e.lhs) : m(e.lhs), n = typeof e.rhs == "number" ? e.rhs : 0;
-			return p(t, e.sense, n);
+		function v(e) {
+			let t = e.lhs instanceof Object && "quadTerms" in e.lhs ? _(e.lhs) : g(e.lhs), n = typeof e.rhs == "number" ? e.rhs : 0;
+			return h(t, e.sense, n);
 		}
-		function _(i) {
-			if (i instanceof e || i && typeof i == "object" && "name" in i && typeof i.id == "number" && !("op" in i) && !("lhs" in i)) return s(i);
-			if (i instanceof n || i && typeof i == "object" && "lhs" in i && "sense" in i) return g(i);
-			if (i instanceof t || i && typeof i == "object" && "op" in i && Array.isArray(i.children)) {
+		function y(i) {
+			if (i instanceof t || i && typeof i == "object" && "name" in i && typeof i.id == "number" && !("op" in i) && !("lhs" in i)) return l(i);
+			if (i instanceof n || i && typeof i == "object" && "lhs" in i && "sense" in i) return v(i);
+			if (i instanceof e || i && typeof i == "object" && "op" in i && Array.isArray(i.children)) {
 				let e = i;
 				switch (e.op) {
-					case "and": return r.And(...e.children.map(_));
-					case "or": return r.Or(...e.children.map(_));
-					case "not": return r.Not(_(e.children[0]));
-					case "implies": return r.Implies(_(e.children[0]), _(e.children[1]));
-					case "xor": return r.Xor(_(e.children[0]), _(e.children[1]));
+					case "and": return r.And(...e.children.map(y));
+					case "or": return r.Or(...e.children.map(y));
+					case "not": return r.Not(y(e.children[0]));
+					case "implies": return r.Implies(y(e.children[0]), y(e.children[1]));
+					case "xor": return e.children.length === 0 ? r.Bool.val(!1) : e.children.length === 1 ? y(e.children[0]) : e.children.slice(1).reduce((e, t) => r.Xor(e, y(t)), y(e.children[0]));
 					default: throw Error(`Unsupported boolean operation: ${e.op}`);
 				}
 			}
 			throw Error(`Unknown logic element: ${String(i)}`);
 		}
-		function v(e) {
+		function b(e) {
 			if (!e) return 0;
 			if (typeof e.asNumber == "function") return e.asNumber();
 			let t = e.toString();
@@ -341,60 +343,85 @@ var E = class {
 			return Number(t);
 		}
 		return {
-			getVarAst: o,
-			getBoolVarAst: s,
-			compareAstWithNumber: p,
-			translateLinExpr: m,
-			translateQuadExpr: h,
-			translateConstraint: g,
-			translateBoolExpr: _,
-			parseAstValue: v,
+			getVarAst: c,
+			getBoolVarAst: l,
+			compareAstWithNumber: h,
+			translateLinExpr: g,
+			translateQuadExpr: _,
+			translateConstraint: v,
+			translateBoolExpr: y,
+			parseAstValue: b,
 			varAstMap: i,
 			boolVarAstMap: a
 		};
 	}
-	async check(e, t = {}) {
-		let { Context: n } = await w(t), r = new n(`check_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), i = new r.Solver(), a = this.createContextTranslator(r), o = e.variables || e.vars || [], s = e.boolVars || [], c = e.constraints || [], l = e.logicalConstraints || [];
-		for (let e of o) {
-			let t = a.getVarAst(e);
-			e.lb !== -Infinity && i.add(a.compareAstWithNumber(t, ">=", e.lb)), e.ub !== Infinity && i.add(a.compareAstWithNumber(t, "<=", e.ub)), (e.type === "Binary" || e.type === "BINARY") && (i.add(a.compareAstWithNumber(t, ">=", 0)), i.add(a.compareAstWithNumber(t, "<=", 1)));
-		}
-		for (let e of c) {
-			let t = a.translateConstraint(e), n = r.Bool.const(e.name);
-			i.addAndTrack(t, n);
-		}
-		for (let e = 0; e < l.length; e++) {
-			let t = l[e], n = t && t.name || `lc_${e + 1}`, o = t && t.expr || t, s = a.translateBoolExpr(o), c = r.Bool.const(n);
-			i.addAndTrack(s, c);
+	addVariableBounds(e, t, n) {
+		for (let r of t) {
+			let t = n.getVarAst(r);
+			r.lb !== -Infinity && e.add(n.compareAstWithNumber(t, ">=", r.lb)), r.ub !== Infinity && e.add(n.compareAstWithNumber(t, "<=", r.ub)), (r.type === "Binary" || r.type === "BINARY") && (e.add(n.compareAstWithNumber(t, ">=", 0)), e.add(n.compareAstWithNumber(t, "<=", 1)));
 		}
-		let u, d;
+	}
+	async runZ3CheckWithErrorGuard(e, t) {
+		let n;
 		try {
-			let e = i.check();
-			d = await new Promise((t, n) => {
-				u = h(n), e.then(t, n);
+			let r = e.check();
+			return await new Promise((e, i) => {
+				n = p(i, t), r.then(e, i);
 			});
 		} finally {
-			u?.();
-		}
-		let f = d.toString();
-		if (f === "sat") {
-			let e = i.model(), t = {};
-			for (let n of o) {
-				let r = a.getVarAst(n), i = e.eval(r);
-				t[n.name] = a.parseAstValue(i);
-			}
+			n?.();
+		}
+	}
+	async check(e, t = {}) {
+		if (e?.variables?.some((e) => e.initialValue !== void 0)) throw Error(`Solver "${this.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		if (t.signal?.aborted) return {
+			status: "Unknown",
+			values: {}
+		};
+		let n = await S(t), { Context: r } = n;
+		if (t.signal?.aborted) return {
+			status: "Unknown",
+			values: {}
+		};
+		let i = new r(`check_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), a = new i.Solver(), o = this.createContextTranslator(i), s = e.variables || [], c = e.boolVars || [], l = e.constraints || [], u = e.logicalConstraints || [];
+		this.addVariableBounds(a, s, o);
+		let d = new Set(c.map((e) => e.name)), f = /* @__PURE__ */ new Map(), p = 0, m = (e) => {
+			let t = `__washi_track_${++p}`;
+			for (; d.has(t) || f.has(t);) t = `__washi_track_${++p}`;
+			let n = i.Bool.const(t);
+			return f.set(t, e), f.set(n.toString(), e), n;
+		};
+		for (let e of l) a.addAndTrack(o.translateConstraint(e), m(e.name));
+		for (let e = 0; e < u.length; e++) {
+			let t = u[e], n = "name" in t && typeof t.name == "string" ? t.name : `lc_${e + 1}`, r = "expr" in t ? t.expr : t;
+			a.addAndTrack(o.translateBoolExpr(r), m(n));
+		}
+		if (t.signal?.aborted) return {
+			status: "Unknown",
+			values: {}
+		};
+		let h = (await this.runZ3CheckWithErrorGuard(a, n)).toString();
+		if (h === "sat") {
+			let e = a.model(), t = {};
 			for (let n of s) {
-				let r = a.getBoolVarAst(n), i = e.eval(r);
-				t[n.name] = i.toString() === "true";
+				let r = o.getVarAst(n), i = e.eval(r);
+				w(t, n.name, o.parseAstValue(i));
+			}
+			for (let n of c) {
+				let r = o.getBoolVarAst(n), i = e.eval(r);
+				w(t, n.name, i.toString() === "true");
 			}
 			return {
 				status: "Sat",
 				values: t
 			};
 		}
-		if (f === "unsat") {
-			let e = i.unsatCore(), t = [], n = typeof e.length == "function" ? e.length() : e.length;
-			for (let r = 0; r < n; r++) t.push(e.get(r).toString());
+		if (h === "unsat") {
+			let e = a.unsatCore(), t = [], n = typeof e.length == "function" ? e.length() : e.length;
+			for (let r = 0; r < n; r++) {
+				let n = e.get(r).toString();
+				t.push(f.get(n) ?? n);
+			}
 			return {
 				status: "Unsat",
 				values: {},
@@ -406,71 +433,184 @@ var E = class {
 			values: {}
 		};
 	}
-	async solve(e, t, n = {}) {
-		if (!(e.objective !== null && e.objective !== void 0 && ("terms" in e.objective && e.objective.terms.size > 0 || "linearTerms" in e.objective && e.objective.linearTerms.size > 0 || "quadTerms" in e.objective && e.objective.quadTerms.length > 0 || e.objective.offset && e.objective.offset !== 0))) {
-			let t = await this.check(e, n), r = {};
-			for (let [e, n] of Object.entries(t.values)) r[e] = typeof n == "boolean" ? +!!n : n;
+	async solve(e, t, n) {
+		let r = (i(t) ? n : t) ?? {};
+		if (e?.variables?.some((e) => e.initialValue !== void 0)) throw Error(`Solver "${this.name}" does not support primal initial values (initialValue). Please use a solver with warm-start support such as HiGHS.`);
+		if (r.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {}
+		};
+		let a = performance.now(), o = e.objective;
+		if (!(o != null && ("quadTerms" in o ? o.linearTerms.size > 0 || o.quadTerms.size > 0 : "terms" in o && o.terms.size > 0))) {
+			let t = await this.check(e, r), n = {}, i = {};
+			for (let [e, r] of Object.entries(t.values)) typeof r == "boolean" ? (w(n, e, +!!r), w(i, e, r)) : w(n, e, r);
+			let s = t.status === "Sat", c = s ? o?.constant ?? 0 : null;
+			if (r.onProgress && !r.signal?.aborted) {
+				let e = (performance.now() - a) / 1e3;
+				r.onProgress({
+					elapsedTime: e,
+					elapsedSeconds: e,
+					...typeof c == "number" && Number.isFinite(c) ? { objectiveValue: c } : {}
+				});
+			}
+			if (r.signal?.aborted) return {
+				status: s ? "Feasible" : "Unknown",
+				terminationStatus: "Interrupted",
+				hasPrimalSolution: s,
+				objectiveValue: c,
+				values: s ? n : {},
+				...s && Object.keys(i).length > 0 ? { boolValues: i } : {}
+			};
+			let l = s ? "Optimal" : t.status === "Unsat" ? "Infeasible" : t.status === "Unknown" ? "Unknown" : "Error";
 			return {
-				status: t.status === "Sat" ? "Optimal" : t.status === "Unsat" ? "Infeasible" : "Error",
-				objectiveValue: 0,
-				values: r
+				status: l,
+				terminationStatus: l,
+				hasPrimalSolution: s,
+				objectiveValue: c,
+				values: s ? n : {},
+				...s && Object.keys(i).length > 0 ? { boolValues: i } : {}
 			};
 		}
-		let { Context: r } = await w(n), i = new r(`opt_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), a = new i.Optimize(), o = this.createContextTranslator(i), s = e.variables || e.vars || [], c = e.boolVars || [], l = e.constraints || [], u = e.logicalConstraints || [];
-		for (let e of s) {
-			let t = o.getVarAst(e);
-			e.lb !== -Infinity && a.add(o.compareAstWithNumber(t, ">=", e.lb)), e.ub !== Infinity && a.add(o.compareAstWithNumber(t, "<=", e.ub)), (e.type === "Binary" || e.type === "BINARY") && (a.add(o.compareAstWithNumber(t, ">=", 0)), a.add(o.compareAstWithNumber(t, "<=", 1)));
-		}
-		for (let e of l) {
-			let t = o.translateConstraint(e);
-			a.add(t);
-		}
-		for (let e of u) {
-			let t = e && e.expr || e, n = o.translateBoolExpr(t);
-			a.add(n);
-		}
-		let d = e.objective instanceof Object && "quadTerms" in e.objective ? o.translateQuadExpr(e.objective) : o.translateLinExpr(e.objective);
-		(e.sense || "MINIMIZE").toUpperCase() === "MAXIMIZE" ? a.maximize(d) : a.minimize(d);
-		let f, p;
-		try {
-			let e = a.check();
-			p = await new Promise((t, n) => {
-				f = h(n), e.then(t, n);
-			});
-		} finally {
-			f?.();
-		}
-		let m = p.toString();
-		if (m === "sat") {
-			let e = a.model(), t = {};
-			for (let n of s) {
-				let r = o.getVarAst(n), i = e.eval(r);
-				t[n.name] = o.parseAstValue(i);
+		let s = await S(r), { Context: c } = s;
+		if (r.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {}
+		};
+		let l = new c(`opt_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`), u = new l.Optimize(), d = this.createContextTranslator(l), f = e.variables || [], p = e.boolVars || [], m = e.constraints || [], h = e.logicalConstraints || [];
+		this.addVariableBounds(u, f, d);
+		for (let e of m) {
+			let t = d.translateConstraint(e);
+			u.add(t);
+		}
+		for (let e of h) {
+			let t = "expr" in e ? e.expr : e, n = d.translateBoolExpr(t);
+			u.add(n);
+		}
+		let g = "quadTerms" in o ? d.translateQuadExpr(o) : d.translateLinExpr(o), _ = (e.sense || "MINIMIZE").toUpperCase(), v = _ === "MAXIMIZE" ? u.maximize(g) : u.minimize(g);
+		if (r.signal?.aborted) return {
+			status: "Unknown",
+			terminationStatus: "Interrupted",
+			hasPrimalSolution: !1,
+			objectiveValue: null,
+			values: {}
+		};
+		let y = (await this.runZ3CheckWithErrorGuard(u, s)).toString();
+		if (y === "sat") {
+			let e = u.model(), t = {}, n = {};
+			for (let n of f) {
+				let r = d.getVarAst(n), i = e.eval(r);
+				w(t, n.name, d.parseAstValue(i));
 			}
-			for (let n of c) {
-				let r = o.getBoolVarAst(n), i = e.eval(r);
-				t[n.name] = +(i.toString() === "true");
+			for (let r of p) {
+				let i = d.getBoolVarAst(r), a = e.eval(i).toString() === "true";
+				w(t, r.name, +!!a), w(n, r.name, a);
+			}
+			let i = d.parseAstValue(e.eval(g)), o = !1, s = !1;
+			try {
+				let e = _ === "MAXIMIZE" ? typeof u.getUpper == "function" ? u.getUpper(v) : void 0 : typeof u.getLower == "function" ? u.getLower(v) : void 0, t = e ? e.toString() : "";
+				t.includes("oo") ? o = !0 : t.includes("epsilon") && (s = !0);
+			} catch {}
+			if (o) {
+				if (r.onProgress) {
+					let e = (performance.now() - a) / 1e3;
+					r.onProgress({
+						elapsedTime: e,
+						elapsedSeconds: e,
+						...Number.isFinite(i) ? { objectiveValue: i } : {}
+					});
+				}
+				return {
+					status: "Unbounded",
+					terminationStatus: "Unbounded",
+					hasPrimalSolution: !0,
+					objectiveValue: i,
+					values: t,
+					...Object.keys(n).length > 0 ? { boolValues: n } : {}
+				};
+			}
+			if (s) {
+				if (r.onProgress) {
+					let e = (performance.now() - a) / 1e3;
+					r.onProgress({
+						elapsedTime: e,
+						elapsedSeconds: e
+					});
+				}
+				return {
+					status: "Unknown",
+					terminationStatus: "Unknown",
+					hasPrimalSolution: !1,
+					objectiveValue: null,
+					values: {}
+				};
+			}
+			if (r.onProgress) {
+				let e = (performance.now() - a) / 1e3;
+				r.onProgress({
+					elapsedTime: e,
+					elapsedSeconds: e,
+					...Number.isFinite(i) ? { objectiveValue: i } : {}
+				});
 			}
 			return {
 				status: "Optimal",
-				objectiveValue: o.parseAstValue(e.eval(d)),
-				values: t
+				terminationStatus: "Optimal",
+				hasPrimalSolution: !0,
+				objectiveValue: i,
+				values: t,
+				...Object.keys(n).length > 0 ? { boolValues: n } : {}
 			};
 		}
-		return m === "unsat" ? {
-			status: "Infeasible",
-			objectiveValue: null,
-			values: {}
-		} : {
+		if (y === "unsat") {
+			if (r.onProgress) {
+				let e = (performance.now() - a) / 1e3;
+				r.onProgress({
+					elapsedTime: e,
+					elapsedSeconds: e
+				});
+			}
+			return {
+				status: "Infeasible",
+				terminationStatus: "Infeasible",
+				hasPrimalSolution: !1,
+				objectiveValue: null,
+				values: {}
+			};
+		}
+		if (y === "unknown") {
+			if (r.onProgress) {
+				let e = (performance.now() - a) / 1e3;
+				r.onProgress({
+					elapsedTime: e,
+					elapsedSeconds: e
+				});
+			}
+			return {
+				status: "Unknown",
+				terminationStatus: "Unknown",
+				hasPrimalSolution: !1,
+				objectiveValue: null,
+				values: {}
+			};
+		}
+		return {
 			status: "Error",
+			terminationStatus: "Error",
+			hasPrimalSolution: !1,
 			objectiveValue: null,
 			values: {}
 		};
 	}
 };
-function D() {
-	r("z3", () => new E());
+function E() {
+	r("z3", () => new T());
 }
-D();
+E();
 //#endregion
-export { E as Z3Solver, C as ensureInitZ3Loaded, T as killZ3Threads, w as loadZ3, g as notifyZ3WorkerError, x as probeAssetUrl, h as registerZ3ErrorHandler, D as registerZ3Solver, y as resetZ3LoaderCache, S as resolveZ3AssetUrls, v as setZ3Assets, p as unlockAllZ3Semaphores, b as validateZ3BrowserEnvironment };
+export { T as Z3Solver, x as ensureInitZ3Loaded, C as killZ3Threads, S as loadZ3, m as notifyZ3WorkerError, y as probeAssetUrl, p as registerZ3ErrorHandler, E as registerZ3Solver, _ as resetZ3LoaderCache, b as resolveZ3AssetUrls, g as setZ3Assets, v as validateZ3BrowserEnvironment };