llmz 0.9.0 → 0.9.2

package/dist/{vm-BLsHw1da.js → vm-Cn3jvZ00.js}

@@ -3,7 +3,7 @@ import { B as isSymbol, I as isFunction, M as baseAssignValue, t as baseIteratee
 import { t as baseForOwn } from "./_baseForOwn-CFhWe_W6.js";
 import { t as cleanStackTrace } from "./stack-traces-BIE_5Xwf.js";
 import { a as InvalidCodeError, c as SnapshotSignal, n as CodeExecutionError, s as Signals, u as VMSignal } from "./errors-Cg1G0Awu.js";
-import { n as compile, t as Identifiers } from "./compiler-CW1VjQsn.js";
+import { n as compile, t as Identifiers } from "./compiler-BPl-5CXh.js";
 import { n as getQuickJSVariant } from "./quickjs-variant-BYhMBpwU.js";
 import { newQuickJSWASMModuleFromVariant, shouldInterruptAfterDeadline } from "quickjs-emscripten-core";
 //#region ../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseGt.js
@@ -2481,6 +2481,22 @@ var QuickJSDriver = class {
 		const trackedProperties = /* @__PURE__ */ new Set();
 		const referenceProperties = /* @__PURE__ */ new Set();
 		const pendingPromises = [];
+		const variableGetters = /* @__PURE__ */ new Map();
+		const objectConstructor = vm.getProp(vm.global, "Object");
+		const freezeFunction = vm.getProp(objectConstructor, "freeze");
+		objectConstructor.dispose();
+		const preserveFreeze = (value, handle) => {
+			if (Object.isFrozen(value)) {
+				const frozen = vm.callFunction(freezeFunction, vm.undefined, handle);
+				try {
+					frozen.unwrap().dispose();
+				} catch (error) {
+					handle.dispose();
+					throw error;
+				}
+			}
+			return handle;
+		};
 		const toVmValue = (value) => {
 			if (typeof value === "string") return vm.newString(value);
 			else if (typeof value === "number") return vm.newNumber(value);
@@ -2488,21 +2504,13 @@ var QuickJSDriver = class {
 			else if (value === null) return vm.null;
 			else if (value === void 0) return vm.undefined;
 			else if (Array.isArray(value)) {
-				const items = value.map((item) => {
-					if (typeof item === "string") return JSON.stringify(item);
-					else if (typeof item === "number" || typeof item === "boolean") return String(item);
-					else if (item === null) return "null";
-					else if (item === void 0) return "undefined";
-					else if (typeof item === "object") return JSON.stringify(item);
-					return "undefined";
+				const array = vm.newArray();
+				value.forEach((item, index) => {
+					const handle = toVmValue(item);
+					vm.setProp(array, index, handle);
+					disposeIfNeeded(handle);
 				});
-				const result = vm.evalCode(`[${items.join(",")}]`);
-				if ("error" in result) {
-					var _result$error;
-					(_result$error = result.error) === null || _result$error === void 0 || _result$error.dispose();
-					return vm.undefined;
-				}
-				return result.value;
+				return preserveFreeze(value, array);
 			} else if (typeof value === "object") {
 				const obj = vm.newObject();
 				for (const [k, v] of Object.entries(value)) if (typeof v !== "function") {
@@ -2510,7 +2518,7 @@ var QuickJSDriver = class {
 					vm.setProp(obj, k, propHandle);
 					disposeIfNeeded(propHandle);
 				}
-				return obj;
+				return preserveFreeze(value, obj);
 			}
 			return vm.undefined;
 		};
@@ -2541,8 +2549,9 @@ var QuickJSDriver = class {
 			};
 		};
 		try {
+			installValueReader(vm);
 			bridgeContextToVM(context, vm, trackedProperties, referenceProperties, toVmValue, disposeIfNeeded, bridgeFunction);
-			setupVariableTrackingBridge(vm, variables);
+			setupVariableTrackingBridge(vm, variables, variableGetters);
 			const scriptCode = buildScriptCode(transformed.code);
 			const copyBackContextFromVM = () => {
 				for (const key of trackedProperties) {
@@ -2599,7 +2608,7 @@ var QuickJSDriver = class {
 			let returnValue = void 0;
 			if (resultSet) {
 				const resultResult = vm.evalCode("globalThis.__llmz_result");
-				returnValue = vm.dump(resultResult.unwrap());
+				returnValue = readVmValue(vm, resultResult.unwrap());
 				resultResult.unwrap().dispose();
 			}
 			returnValue = Signals.maybeDeserializeError(returnValue);
@@ -2631,6 +2640,8 @@ var QuickJSDriver = class {
 			})).catch(() => {});
 			return handleErrorQuickJS(err, code, consumer, traces, variables, lines_executed, userCodeStartLine, ctx.currentToolCall ?? state.currentToolCall);
 		} finally {
+			for (const getter of variableGetters.values()) getter.dispose();
+			freezeFunction.dispose();
 			try {
 				vm.dispose();
 			} catch {}
@@ -2780,7 +2791,7 @@ function bridgeContextToVM(context, vm, trackedProperties, referenceProperties,
 	}
 }
 function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
-	var _result$error2;
+	var _result$error;
 	const target = prop ? `${key}` : "globalThis";
 	const propName = prop ?? key;
 	const prefix = prop ? `${key}_${prop}` : key;
@@ -2802,7 +2813,7 @@ function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
 	if (descriptor.set) {
 		const setterBridge = vm.newFunction(`set_${propName}`, (valueHandle) => {
 			try {
-				const jsValue = vm.dump(valueHandle);
+				const jsValue = readVmValue(vm, valueHandle, true);
 				if (prop) context[key][prop] = jsValue;
 				else context[key] = jsValue;
 				return vm.undefined;
@@ -2824,31 +2835,88 @@ function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
     });
   `;
 	const result = vm.evalCode(definePropertyCode);
-	if ("error" in result) (_result$error2 = result.error) === null || _result$error2 === void 0 || _result$error2.dispose();
+	if ("error" in result) (_result$error = result.error) === null || _result$error === void 0 || _result$error.dispose();
 	else result.value.dispose();
 }
-function setupVariableTrackingBridge(vm, variables) {
-	const varTrackFnHandle = vm.newFunction(Identifiers.VariableTrackingFnIdentifier, (nameHandle, getterHandle) => {
+function installValueReader(vm) {
+	vm.evalCode(`
+    globalThis.__llmz_read_value = function encode(value, strict, seen = new Set()) {
+      if (value === undefined) return ['undefined'];
+      if (typeof value === 'number') {
+        if (strict && !Number.isFinite(value)) throw new Error('Non-finite numbers cannot be assigned to host properties');
+        return ['number', Object.is(value, -0) ? '-0' : String(value)];
+      }
+      if (value === null || typeof value === 'string' || typeof value === 'boolean') return ['value', value];
+      if (typeof value !== 'object') throw new Error('Unsupported VM value: ' + typeof value);
+      if (seen.has(value)) throw new Error('Cyclic VM values cannot be transferred');
+      if (value instanceof Date) return ['value', value.toJSON()];
+      seen.add(value);
+      try {
+        if (Array.isArray(value)) return ['array', Array.from(value, item => encode(item, strict, seen))];
+        return ['object', Object.entries(value).map(([key, item]) => [key, encode(item, strict, seen)])];
+      } finally {
+        seen.delete(value);
+      }
+    };
+  `).unwrap().dispose();
+}
+function readVmValue(vm, handle, strict = false) {
+	const decode = ([type, value]) => {
+		if (type === "undefined") return void 0;
+		if (type === "number") return Number(value);
+		if (type === "array") return value.map(decode);
+		if (type === "object") return Object.fromEntries(value.map(([key, item]) => [key, decode(item)]));
+		return value;
+	};
+	const encoder = vm.getProp(vm.global, "__llmz_read_value");
+	try {
+		const result = vm.callFunction(encoder, vm.undefined, handle, strict ? vm.true : vm.false);
+		if (result.error) {
+			const error = vm.dump(result.error);
+			result.error.dispose();
+			if (strict) throw new Error(error.message);
+			const copy = handle.dup();
+			try {
+				return vm.dump(copy);
+			} finally {
+				if (copy.alive) copy.dispose();
+			}
+		}
+		try {
+			return decode(vm.dump(result.value));
+		} finally {
+			result.value.dispose();
+		}
+	} finally {
+		encoder.dispose();
+	}
+}
+function setupVariableTrackingBridge(vm, variables, getters) {
+	const tracker = vm.newFunction(Identifiers.VariableTrackingFnIdentifier, (nameHandle, getterHandle) => {
+		var _getters$get;
 		const name = vm.getString(nameHandle);
 		if (NO_TRACKING.includes(name)) return;
-		try {
-			const valueResult = vm.callFunction(getterHandle, vm.undefined);
-			if ("error" in valueResult) {
-				var _valueResult$error;
-				variables[name] = "[[non-primitive]]";
-				(_valueResult$error = valueResult.error) === null || _valueResult$error === void 0 || _valueResult$error.dispose();
-				return;
+		(_getters$get = getters.get(name)) === null || _getters$get === void 0 || _getters$get.dispose();
+		const getter = getterHandle.dup();
+		getters.set(name, getter);
+		variables[name] = () => {
+			const result = vm.callFunction(getter, vm.undefined);
+			if (result.error) {
+				result.error.dispose();
+				return "[[non-primitive]]";
 			}
-			const value = vm.dump(valueResult.value);
-			valueResult.value.dispose();
-			if (typeof value === "function" || typeof value === "string" && value.includes("=>")) variables[name] = "[[non-primitive]]";
-			else variables[name] = value;
-		} catch {
-			variables[name] = "[[non-primitive]]";
-		}
+			try {
+				if (vm.typeof(result.value) === "function") return "[[non-primitive]]";
+				return readVmValue(vm, result.value);
+			} catch {
+				return "[[non-primitive]]";
+			} finally {
+				result.value.dispose();
+			}
+		};
 	});
-	vm.setProp(vm.global, Identifiers.VariableTrackingFnIdentifier, varTrackFnHandle);
-	varTrackFnHandle.dispose();
+	vm.setProp(vm.global, Identifiers.VariableTrackingFnIdentifier, tracker);
+	tracker.dispose();
 }
 function buildScriptCode(transformedCode) {
 	return `
@@ -2919,21 +2987,10 @@ async function runAsyncFunction(context, code, traces = [], signal = null, timeo
 	});
 	context ??= {};
 	for (const name of Array.from(transformed.variables)) delete context[name];
-	let driver;
+	let driver = new NodeDriver();
 	if (useQuickJS()) try {
+		await loadQuickJSModule();
 		driver = new QuickJSDriver();
-		return await driver.execute({
-			transformed,
-			consumer,
-			context,
-			traces,
-			signal,
-			timeout,
-			code,
-			lines_executed,
-			variables,
-			currentToolCall: void 0
-		});
 	} catch (quickjsError) {
 		const variant = getQuickJSVariant();
 		const debugInfo = {
@@ -2959,7 +3016,6 @@ async function runAsyncFunction(context, code, traces = [], signal = null, timeo
 		console.warn("Error:", (quickjsError === null || quickjsError === void 0 ? void 0 : quickjsError.message) || quickjsError);
 		console.warn("Debug info:", JSON.stringify(debugInfo, null, 2));
 	}
-	driver = new NodeDriver();
 	return await driver.execute({
 		transformed,
 		consumer,

package/dist/{vm-D6s1zF6M.cjs → vm-X0uTj5Aa.cjs}

@@ -1,4 +1,4 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
 const require__baseIteratee = require("./_baseIteratee-CF4qP2a8.cjs");
 const require__baseForOwn = require("./_baseForOwn-BfWDTL8L.cjs");
 const require_stack_traces = require("./stack-traces-ntw_qhoy.cjs");
@@ -2480,6 +2480,22 @@ var QuickJSDriver = class {
 		const trackedProperties = /* @__PURE__ */ new Set();
 		const referenceProperties = /* @__PURE__ */ new Set();
 		const pendingPromises = [];
+		const variableGetters = /* @__PURE__ */ new Map();
+		const objectConstructor = vm.getProp(vm.global, "Object");
+		const freezeFunction = vm.getProp(objectConstructor, "freeze");
+		objectConstructor.dispose();
+		const preserveFreeze = (value, handle) => {
+			if (Object.isFrozen(value)) {
+				const frozen = vm.callFunction(freezeFunction, vm.undefined, handle);
+				try {
+					frozen.unwrap().dispose();
+				} catch (error) {
+					handle.dispose();
+					throw error;
+				}
+			}
+			return handle;
+		};
 		const toVmValue = (value) => {
 			if (typeof value === "string") return vm.newString(value);
 			else if (typeof value === "number") return vm.newNumber(value);
@@ -2487,21 +2503,13 @@ var QuickJSDriver = class {
 			else if (value === null) return vm.null;
 			else if (value === void 0) return vm.undefined;
 			else if (Array.isArray(value)) {
-				const items = value.map((item) => {
-					if (typeof item === "string") return JSON.stringify(item);
-					else if (typeof item === "number" || typeof item === "boolean") return String(item);
-					else if (item === null) return "null";
-					else if (item === void 0) return "undefined";
-					else if (typeof item === "object") return JSON.stringify(item);
-					return "undefined";
+				const array = vm.newArray();
+				value.forEach((item, index) => {
+					const handle = toVmValue(item);
+					vm.setProp(array, index, handle);
+					disposeIfNeeded(handle);
 				});
-				const result = vm.evalCode(`[${items.join(",")}]`);
-				if ("error" in result) {
-					var _result$error;
-					(_result$error = result.error) === null || _result$error === void 0 || _result$error.dispose();
-					return vm.undefined;
-				}
-				return result.value;
+				return preserveFreeze(value, array);
 			} else if (typeof value === "object") {
 				const obj = vm.newObject();
 				for (const [k, v] of Object.entries(value)) if (typeof v !== "function") {
@@ -2509,7 +2517,7 @@ var QuickJSDriver = class {
 					vm.setProp(obj, k, propHandle);
 					disposeIfNeeded(propHandle);
 				}
-				return obj;
+				return preserveFreeze(value, obj);
 			}
 			return vm.undefined;
 		};
@@ -2540,8 +2548,9 @@ var QuickJSDriver = class {
 			};
 		};
 		try {
+			installValueReader(vm);
 			bridgeContextToVM(context, vm, trackedProperties, referenceProperties, toVmValue, disposeIfNeeded, bridgeFunction);
-			setupVariableTrackingBridge(vm, variables);
+			setupVariableTrackingBridge(vm, variables, variableGetters);
 			const scriptCode = buildScriptCode(transformed.code);
 			const copyBackContextFromVM = () => {
 				for (const key of trackedProperties) {
@@ -2598,7 +2607,7 @@ var QuickJSDriver = class {
 			let returnValue = void 0;
 			if (resultSet) {
 				const resultResult = vm.evalCode("globalThis.__llmz_result");
-				returnValue = vm.dump(resultResult.unwrap());
+				returnValue = readVmValue(vm, resultResult.unwrap());
 				resultResult.unwrap().dispose();
 			}
 			returnValue = require_errors.Signals.maybeDeserializeError(returnValue);
@@ -2630,6 +2639,8 @@ var QuickJSDriver = class {
 			})).catch(() => {});
 			return handleErrorQuickJS(err, code, consumer, traces, variables, lines_executed, userCodeStartLine, ctx.currentToolCall ?? state.currentToolCall);
 		} finally {
+			for (const getter of variableGetters.values()) getter.dispose();
+			freezeFunction.dispose();
 			try {
 				vm.dispose();
 			} catch {}
@@ -2779,7 +2790,7 @@ function bridgeContextToVM(context, vm, trackedProperties, referenceProperties,
 	}
 }
 function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
-	var _result$error2;
+	var _result$error;
 	const target = prop ? `${key}` : "globalThis";
 	const propName = prop ?? key;
 	const prefix = prop ? `${key}_${prop}` : key;
@@ -2801,7 +2812,7 @@ function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
 	if (descriptor.set) {
 		const setterBridge = vm.newFunction(`set_${propName}`, (valueHandle) => {
 			try {
-				const jsValue = vm.dump(valueHandle);
+				const jsValue = readVmValue(vm, valueHandle, true);
 				if (prop) context[key][prop] = jsValue;
 				else context[key] = jsValue;
 				return vm.undefined;
@@ -2823,31 +2834,88 @@ function bridgeGetterSetter(vm, key, prop, descriptor, context, toVmValue) {
     });
   `;
 	const result = vm.evalCode(definePropertyCode);
-	if ("error" in result) (_result$error2 = result.error) === null || _result$error2 === void 0 || _result$error2.dispose();
+	if ("error" in result) (_result$error = result.error) === null || _result$error === void 0 || _result$error.dispose();
 	else result.value.dispose();
 }
-function setupVariableTrackingBridge(vm, variables) {
-	const varTrackFnHandle = vm.newFunction(require_compiler.Identifiers.VariableTrackingFnIdentifier, (nameHandle, getterHandle) => {
+function installValueReader(vm) {
+	vm.evalCode(`
+    globalThis.__llmz_read_value = function encode(value, strict, seen = new Set()) {
+      if (value === undefined) return ['undefined'];
+      if (typeof value === 'number') {
+        if (strict && !Number.isFinite(value)) throw new Error('Non-finite numbers cannot be assigned to host properties');
+        return ['number', Object.is(value, -0) ? '-0' : String(value)];
+      }
+      if (value === null || typeof value === 'string' || typeof value === 'boolean') return ['value', value];
+      if (typeof value !== 'object') throw new Error('Unsupported VM value: ' + typeof value);
+      if (seen.has(value)) throw new Error('Cyclic VM values cannot be transferred');
+      if (value instanceof Date) return ['value', value.toJSON()];
+      seen.add(value);
+      try {
+        if (Array.isArray(value)) return ['array', Array.from(value, item => encode(item, strict, seen))];
+        return ['object', Object.entries(value).map(([key, item]) => [key, encode(item, strict, seen)])];
+      } finally {
+        seen.delete(value);
+      }
+    };
+  `).unwrap().dispose();
+}
+function readVmValue(vm, handle, strict = false) {
+	const decode = ([type, value]) => {
+		if (type === "undefined") return void 0;
+		if (type === "number") return Number(value);
+		if (type === "array") return value.map(decode);
+		if (type === "object") return Object.fromEntries(value.map(([key, item]) => [key, decode(item)]));
+		return value;
+	};
+	const encoder = vm.getProp(vm.global, "__llmz_read_value");
+	try {
+		const result = vm.callFunction(encoder, vm.undefined, handle, strict ? vm.true : vm.false);
+		if (result.error) {
+			const error = vm.dump(result.error);
+			result.error.dispose();
+			if (strict) throw new Error(error.message);
+			const copy = handle.dup();
+			try {
+				return vm.dump(copy);
+			} finally {
+				if (copy.alive) copy.dispose();
+			}
+		}
+		try {
+			return decode(vm.dump(result.value));
+		} finally {
+			result.value.dispose();
+		}
+	} finally {
+		encoder.dispose();
+	}
+}
+function setupVariableTrackingBridge(vm, variables, getters) {
+	const tracker = vm.newFunction(require_compiler.Identifiers.VariableTrackingFnIdentifier, (nameHandle, getterHandle) => {
+		var _getters$get;
 		const name = vm.getString(nameHandle);
 		if (NO_TRACKING.includes(name)) return;
-		try {
-			const valueResult = vm.callFunction(getterHandle, vm.undefined);
-			if ("error" in valueResult) {
-				var _valueResult$error;
-				variables[name] = "[[non-primitive]]";
-				(_valueResult$error = valueResult.error) === null || _valueResult$error === void 0 || _valueResult$error.dispose();
-				return;
+		(_getters$get = getters.get(name)) === null || _getters$get === void 0 || _getters$get.dispose();
+		const getter = getterHandle.dup();
+		getters.set(name, getter);
+		variables[name] = () => {
+			const result = vm.callFunction(getter, vm.undefined);
+			if (result.error) {
+				result.error.dispose();
+				return "[[non-primitive]]";
 			}
-			const value = vm.dump(valueResult.value);
-			valueResult.value.dispose();
-			if (typeof value === "function" || typeof value === "string" && value.includes("=>")) variables[name] = "[[non-primitive]]";
-			else variables[name] = value;
-		} catch {
-			variables[name] = "[[non-primitive]]";
-		}
+			try {
+				if (vm.typeof(result.value) === "function") return "[[non-primitive]]";
+				return readVmValue(vm, result.value);
+			} catch {
+				return "[[non-primitive]]";
+			} finally {
+				result.value.dispose();
+			}
+		};
 	});
-	vm.setProp(vm.global, require_compiler.Identifiers.VariableTrackingFnIdentifier, varTrackFnHandle);
-	varTrackFnHandle.dispose();
+	vm.setProp(vm.global, require_compiler.Identifiers.VariableTrackingFnIdentifier, tracker);
+	tracker.dispose();
 }
 function buildScriptCode(transformedCode) {
 	return `
@@ -2918,21 +2986,10 @@ async function runAsyncFunction(context, code, traces = [], signal = null, timeo
 	});
 	context ??= {};
 	for (const name of Array.from(transformed.variables)) delete context[name];
-	let driver;
+	let driver = new NodeDriver();
 	if (useQuickJS()) try {
+		await loadQuickJSModule();
 		driver = new QuickJSDriver();
-		return await driver.execute({
-			transformed,
-			consumer,
-			context,
-			traces,
-			signal,
-			timeout,
-			code,
-			lines_executed,
-			variables,
-			currentToolCall: void 0
-		});
 	} catch (quickjsError) {
 		const variant = require_quickjs_variant.getQuickJSVariant();
 		const debugInfo = {
@@ -2958,7 +3015,6 @@ async function runAsyncFunction(context, code, traces = [], signal = null, timeo
 		console.warn("Error:", (quickjsError === null || quickjsError === void 0 ? void 0 : quickjsError.message) || quickjsError);
 		console.warn("Debug info:", JSON.stringify(debugInfo, null, 2));
 	}
-	driver = new NodeDriver();
 	return await driver.execute({
 		transformed,
 		consumer,

package/package.json

@@ -2,7 +2,7 @@
   "name": "llmz",
   "type": "module",
   "description": "LLMz - An LLM-native Typescript VM built on top of Zui",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "files": [
     "dist",
     "DOCS.md"
@@ -68,7 +68,7 @@
     "tsx": "^4.19.2"
   },
   "peerDependencies": {
-    "@botpress/client": "2.5.0",
+    "@botpress/client": "2.6.0",
     "@botpress/cognitive": "1.2.2",
     "@bpinternal/thicktoken": "^3.1.0",
     "@bpinternal/zui": "^2.4.1"