@probelabs/probe 0.6.0-rc233 → 0.6.0-rc235

package/build/agent/index.js

@@ -9401,7 +9401,7 @@ Manage tasks for tracking progress during code exploration and problem-solving.
 
 Parameters:
 - action: (required) The action to perform: create, update, complete, delete, list
-- tasks: (optional) JSON array for batch operations - alternative to single-task params
+- tasks: (optional) Array of task objects for batch operations. Place raw JSON array directly between tags.
 - id: (optional) Task ID for single operations (e.g., "task-1")
 - title: (optional) Task title for create/update
 - description: (optional) Task description for create/update
@@ -9410,6 +9410,11 @@ Parameters:
 - dependencies: (optional) JSON array of task IDs that must be completed first
 - after: (optional) Task ID to insert the new task after (for ordering). By default, new tasks are appended to the end
 
+IMPORTANT - JSON Format:
+Place raw JSON arrays directly between tags without quotes or escaping:
+  CORRECT:   <tasks>[{"title": "Do X"}]</tasks>
+  INCORRECT: <tasks>"[{"title": "Do X"}]"</tasks>
+
 Usage Examples:
 
 Creating a single task:
@@ -12397,6 +12402,8 @@ var require_utils = __commonJS({
     var AsyncGeneratorFunction = Object.getPrototypeOf(async function* () {
     }).constructor;
     var SandboxGlobal = function SandboxGlobal2(globals) {
+      if (globals === globalThis)
+        return globalThis;
       for (const i in globals) {
         this[i] = globals[i];
       }
@@ -12425,9 +12432,7 @@ var require_utils = __commonJS({
         prototypeWhitelist: new Map([...options.prototypeWhitelist].map((a) => [a[0].prototype, a[1]])),
         options,
         globalScope: new Scope3(null, options.globals, sandboxGlobal),
-        sandboxGlobal,
-        ticks: { ticks: 0n, tickLimit: options.executionQuota },
-        sandboxedFunctions: /* @__PURE__ */ new WeakSet()
+        sandboxGlobal
       };
       context.prototypeWhitelist.set(Object.getPrototypeOf([][Symbol.iterator]()), /* @__PURE__ */ new Set());
       return context;
@@ -12442,15 +12447,9 @@ var require_utils = __commonJS({
         evals.set(AsyncFunction, asyncFunc);
         evals.set(GeneratorFunction, func);
         evals.set(AsyncGeneratorFunction, asyncFunc);
-        evals.set(eval, evalContext.sandboxedEval(func, execContext));
-        evals.set(setTimeout, evalContext.sandboxedSetTimeout(func, execContext));
-        evals.set(setInterval, evalContext.sandboxedSetInterval(func, execContext));
-        evals.set(clearTimeout, evalContext.sandboxedClearTimeout(execContext));
-        evals.set(clearInterval, evalContext.sandboxedClearInterval(execContext));
-        for (const [key, value] of evals) {
-          sandbox.context.prototypeWhitelist.set(value.prototype, /* @__PURE__ */ new Set());
-          sandbox.context.prototypeWhitelist.set(key.prototype, /* @__PURE__ */ new Set());
-        }
+        evals.set(eval, evalContext.sandboxedEval(func));
+        evals.set(setTimeout, evalContext.sandboxedSetTimeout(func));
+        evals.set(setInterval, evalContext.sandboxedSetInterval(func));
       }
       return execContext;
     }
@@ -12547,45 +12546,34 @@ var require_utils = __commonJS({
       return ret;
     }
     var reservedWords2 = /* @__PURE__ */ new Set([
-      "await",
-      "break",
-      "case",
-      "catch",
-      "class",
-      "const",
-      "continue",
-      "debugger",
-      "default",
-      "delete",
-      "do",
-      "else",
-      "enum",
-      "export",
-      "extends",
-      "false",
-      "finally",
-      "for",
-      "function",
-      "if",
-      "implements",
-      "import",
-      "in",
       "instanceof",
-      "let",
-      "new",
-      "null",
+      "typeof",
       "return",
-      "super",
-      "switch",
-      "this",
       "throw",
-      "true",
       "try",
-      "typeof",
+      "catch",
+      "if",
+      "finally",
+      "else",
+      "in",
+      "of",
       "var",
-      "void",
+      "let",
+      "const",
+      "for",
+      "delete",
+      "false",
+      "true",
       "while",
-      "with"
+      "do",
+      "break",
+      "continue",
+      "new",
+      "function",
+      "async",
+      "await",
+      "switch",
+      "case"
     ]);
     var Scope3 = class {
       constructor(parent, vars = {}, functionThis) {
@@ -12600,16 +12588,25 @@ var require_utils = __commonJS({
         this.globals = parent === null ? keysOnly(vars) : {};
         this.functionThis = functionThis;
       }
-      get(key) {
-        const isThis = key === "this";
-        const scope = this.getWhereValScope(key, isThis);
-        if (scope && isThis) {
-          return new Prop({ this: scope.functionThis }, key, false, false, true);
+      get(key, functionScope = false) {
+        const functionThis = this.functionThis;
+        if (key === "this" && functionThis !== void 0) {
+          return new Prop({ this: functionThis }, key, true, false, true);
         }
-        if (!scope) {
-          return new Prop(void 0, key);
+        if (reservedWords2.has(key))
+          throw new SyntaxError("Unexepected token '" + key + "'");
+        if (this.parent === null || !functionScope || functionThis !== void 0) {
+          if (this.globals.hasOwnProperty(key)) {
+            return new Prop(functionThis, key, false, true, true);
+          }
+          if (key in this.allVars && (!(key in {}) || this.allVars.hasOwnProperty(key))) {
+            return new Prop(this.allVars, key, this.const.hasOwnProperty(key), this.globals.hasOwnProperty(key), true);
+          }
+          if (this.parent === null) {
+            return new Prop(void 0, key);
+          }
         }
-        return new Prop(scope.allVars, key, key in scope.const, key in scope.globals, true);
+        return this.parent.get(key, functionScope);
       }
       set(key, val) {
         if (key === "this")
@@ -12620,72 +12617,34 @@ var require_utils = __commonJS({
         if (prop.context === void 0) {
           throw new ReferenceError(`Variable '${key}' was not declared.`);
         }
-        if (prop.context === null) {
-          throw new TypeError(`Cannot set properties of null, (setting '${key}')`);
-        }
         if (prop.isConst) {
           throw new TypeError(`Cannot assign to const variable '${key}'`);
         }
         if (prop.isGlobal) {
           throw new SandboxError(`Cannot override global variable '${key}'`);
         }
+        if (!(prop.context instanceof Object))
+          throw new SandboxError("Scope is not an object");
         prop.context[prop.prop] = val;
         return prop;
       }
-      getWhereValScope(key, isThis) {
-        if (isThis) {
-          if (this.functionThis !== void 0) {
-            return this;
-          } else {
-            return this.parent?.getWhereValScope(key, isThis) || null;
-          }
-        }
-        if (key in this.allVars && !(key in {} && !hasOwnProperty19(this.allVars, key))) {
-          return this;
-        }
-        return this.parent?.getWhereValScope(key, isThis) || null;
-      }
-      getWhereVarScope(key, localScope = false) {
-        if (key in this.allVars && !(key in {} && !hasOwnProperty19(this.allVars, key))) {
-          return this;
-        }
-        if (this.parent === null || localScope || this.functionThis !== void 0) {
-          return this;
-        }
-        return this.parent.getWhereVarScope(key, localScope);
-      }
       declare(key, type, value = void 0, isGlobal = false) {
         if (key === "this")
           throw new SyntaxError('"this" cannot be declared');
         if (reservedWords2.has(key))
           throw new SyntaxError("Unexepected token '" + key + "'");
-        const existingScope = this.getWhereVarScope(
-          key,
-          type !== "var"
-          /* VarType.var */
-        );
-        if (type === "var") {
-          if (existingScope.var[key]) {
-            existingScope.allVars[key] = value;
-            if (!isGlobal) {
-              delete existingScope.globals[key];
-            } else {
-              existingScope.globals[key] = true;
-            }
-            return new Prop(existingScope.allVars, key, false, existingScope.globals[key], true);
-          } else if (key in existingScope.allVars) {
-            throw new SyntaxError(`Identifier '${key}' has already been declared`);
-          }
-        }
-        if (key in existingScope.allVars) {
-          throw new SyntaxError(`Identifier '${key}' has already been declared`);
-        }
-        if (isGlobal) {
-          existingScope.globals[key] = true;
+        if (type === "var" && this.functionThis === void 0 && this.parent !== null) {
+          return this.parent.declare(key, type, value, isGlobal);
+        } else if (this[type].hasOwnProperty(key) && type !== "const" && !this.globals.hasOwnProperty(key) || !(key in this.allVars)) {
+          if (isGlobal) {
+            this.globals[key] = true;
+          }
+          this[type][key] = true;
+          this.allVars[key] = value;
+        } else {
+          throw new SandboxError(`Identifier '${key}' has already been declared`);
         }
-        existingScope[type][key] = true;
-        existingScope.allVars[key] = value;
-        return new Prop(this.allVars, key, type === "const", isGlobal, true);
+        return new Prop(this.allVars, key, this.const.hasOwnProperty(key), isGlobal);
       }
     };
     var FunctionScope = class {
@@ -12694,16 +12653,8 @@ var require_utils = __commonJS({
     };
     var SandboxError = class extends Error {
     };
-    var SandboxExecutionQuotaExceededError = class extends SandboxError {
-    };
-    var SandboxExecutionTreeError = class extends SandboxError {
-    };
-    var SandboxCapabilityError = class extends SandboxError {
-    };
-    var SandboxAccessError = class extends SandboxError {
-    };
     function isLisp(item) {
-      return Array.isArray(item) && typeof item[0] === "number" && item[0] !== 0 && item[0] !== 88;
+      return Array.isArray(item) && typeof item[0] === "number" && item[0] !== 0 && item[0] !== 89;
     }
     var Prop = class {
       constructor(context, prop, isConst = false, isGlobal = false, isVariable = false) {
@@ -12716,16 +12667,13 @@ var require_utils = __commonJS({
       get(context) {
         const ctx = this.context;
         if (ctx === void 0)
-          throw new ReferenceError(`${this.prop.toString()} is not defined`);
+          throw new ReferenceError(`${this.prop} is not defined`);
         if (ctx === null)
-          throw new TypeError(`Cannot read properties of null, (reading '${this.prop.toString()}')`);
-        context.getSubscriptions.forEach((cb) => cb(ctx, this.prop.toString()));
+          throw new TypeError(`Cannot read properties of null, (reading '${this.prop}')`);
+        context.getSubscriptions.forEach((cb) => cb(ctx, this.prop));
         return ctx[this.prop];
       }
     };
-    function hasOwnProperty19(obj, prop) {
-      return Object.prototype.hasOwnProperty.call(obj, prop);
-    }
     exports2.AsyncFunction = AsyncFunction;
     exports2.AsyncGeneratorFunction = AsyncGeneratorFunction;
     exports2.CodeString = CodeString;
@@ -12734,18 +12682,12 @@ var require_utils = __commonJS({
     exports2.GeneratorFunction = GeneratorFunction;
     exports2.LocalScope = LocalScope;
     exports2.Prop = Prop;
-    exports2.SandboxAccessError = SandboxAccessError;
-    exports2.SandboxCapabilityError = SandboxCapabilityError;
     exports2.SandboxError = SandboxError;
-    exports2.SandboxExecutionQuotaExceededError = SandboxExecutionQuotaExceededError;
-    exports2.SandboxExecutionTreeError = SandboxExecutionTreeError;
     exports2.SandboxGlobal = SandboxGlobal;
     exports2.Scope = Scope3;
     exports2.createContext = createContext;
     exports2.createExecContext = createExecContext;
-    exports2.hasOwnProperty = hasOwnProperty19;
     exports2.isLisp = isLisp;
-    exports2.reservedWords = reservedWords2;
   }
 });
 
@@ -12775,9 +12717,10 @@ var require_executor = __commonJS({
       });
       return vars;
     }
+    var sandboxedFunctions = /* @__PURE__ */ new WeakSet();
     function createFunction(argNames, parsed, ticks, context, scope, name) {
       if (context.ctx.options.forbidFunctionCreation) {
-        throw new utils.SandboxCapabilityError("Function creation is forbidden");
+        throw new utils.SandboxError("Function creation is forbidden");
       }
       let func;
       if (name === void 0) {
@@ -12794,15 +12737,15 @@ var require_executor = __commonJS({
         };
       }
       context.registerSandboxFunction(func);
-      context.ctx.sandboxedFunctions.add(func);
+      sandboxedFunctions.add(func);
       return func;
     }
     function createFunctionAsync(argNames, parsed, ticks, context, scope, name) {
       if (context.ctx.options.forbidFunctionCreation) {
-        throw new utils.SandboxCapabilityError("Function creation is forbidden");
+        throw new utils.SandboxError("Function creation is forbidden");
       }
       if (!context.ctx.prototypeWhitelist?.has(Promise.prototype)) {
-        throw new utils.SandboxCapabilityError("Async/await not permitted");
+        throw new utils.SandboxError("Async/await not permitted");
       }
       let func;
       if (name === void 0) {
@@ -12819,40 +12762,43 @@ var require_executor = __commonJS({
         };
       }
       context.registerSandboxFunction(func);
-      context.ctx.sandboxedFunctions.add(func);
+      sandboxedFunctions.add(func);
       return func;
     }
     function assignCheck(obj, context, op = "assign") {
       if (obj.context === void 0) {
         throw new ReferenceError(`Cannot ${op} value to undefined.`);
       }
+      if (typeof obj.context !== "object" && typeof obj.context !== "function") {
+        throw new SyntaxError(`Cannot ${op} value to a primitive.`);
+      }
       if (obj.isConst) {
-        throw new TypeError(`Assignment to constant variable.`);
+        throw new TypeError(`Cannot set value to const variable '${obj.prop}'`);
       }
       if (obj.isGlobal) {
-        throw new utils.SandboxAccessError(`Cannot ${op} property '${obj.prop.toString()}' of a global object`);
+        throw new utils.SandboxError(`Cannot ${op} property '${obj.prop}' of a global object`);
       }
       if (obj.context === null) {
         throw new TypeError("Cannot set properties of null");
       }
-      if (typeof obj.context[obj.prop] === "function" && !utils.hasOwnProperty(obj.context, obj.prop)) {
-        throw new utils.SandboxAccessError(`Override prototype property '${obj.prop.toString()}' not allowed`);
+      if (typeof obj.context[obj.prop] === "function" && !obj.context.hasOwnProperty(obj.prop)) {
+        throw new utils.SandboxError(`Override prototype property '${obj.prop}' not allowed`);
       }
       if (op === "delete") {
-        if (utils.hasOwnProperty(obj.context, obj.prop)) {
-          context.changeSubscriptions.get(obj.context)?.forEach((cb) => cb({ type: "delete", prop: obj.prop.toString() }));
-          context.changeSubscriptionsGlobal.get(obj.context)?.forEach((cb) => cb({ type: "delete", prop: obj.prop.toString() }));
+        if (obj.context.hasOwnProperty(obj.prop)) {
+          context.changeSubscriptions.get(obj.context)?.forEach((cb) => cb({ type: "delete", prop: obj.prop }));
+          context.changeSubscriptionsGlobal.get(obj.context)?.forEach((cb) => cb({ type: "delete", prop: obj.prop }));
         }
-      } else if (utils.hasOwnProperty(obj.context, obj.prop)) {
-        context.setSubscriptions.get(obj.context)?.get(obj.prop.toString())?.forEach((cb) => cb({
+      } else if (obj.context.hasOwnProperty(obj.prop)) {
+        context.setSubscriptions.get(obj.context)?.get(obj.prop)?.forEach((cb) => cb({
           type: "replace"
         }));
-        context.setSubscriptionsGlobal.get(obj.context)?.get(obj.prop.toString())?.forEach((cb) => cb({
+        context.setSubscriptionsGlobal.get(obj.context)?.get(obj.prop)?.forEach((cb) => cb({
           type: "replace"
         }));
       } else {
-        context.changeSubscriptions.get(obj.context)?.forEach((cb) => cb({ type: "create", prop: obj.prop.toString() }));
-        context.changeSubscriptionsGlobal.get(obj.context)?.forEach((cb) => cb({ type: "create", prop: obj.prop.toString() }));
+        context.changeSubscriptions.get(obj.context)?.forEach((cb) => cb({ type: "create", prop: obj.prop }));
+        context.changeSubscriptionsGlobal.get(obj.context)?.forEach((cb) => cb({ type: "create", prop: obj.prop }));
       }
     }
     var arrayChange = /* @__PURE__ */ new Set([
@@ -12892,128 +12838,107 @@ var require_executor = __commonJS({
     function addOps(type, cb) {
       ops.set(type, cb);
     }
-    var prorptyKeyTypes = ["string", "number", "symbol"];
-    function isPropertyKey(val) {
-      return prorptyKeyTypes.includes(typeof val);
-    }
-    function hasPossibleProperties(val) {
-      return val !== null && val !== void 0;
-    }
-    addOps(1, ({ done, a, b, obj, context, scope }) => {
+    addOps(1, (exec6, done, ticks, a, b, obj, context, scope) => {
       if (a === null) {
-        throw new TypeError(`Cannot read properties of null (reading '${b?.toString()}')`);
-      }
-      if (!isPropertyKey(b)) {
-        b = `${b}`;
+        throw new TypeError(`Cannot get property ${b} of null`);
       }
-      if (a === void 0 && obj === void 0 && typeof b === "string") {
+      const type = typeof a;
+      if (type === "undefined" && obj === void 0) {
         const prop = scope.get(b);
         if (prop.context === context.ctx.sandboxGlobal) {
           if (context.ctx.options.audit) {
             context.ctx.auditReport?.globalsAccess.add(b);
           }
+          const rep = context.ctx.globalsWhitelist.has(context.ctx.sandboxGlobal[b]) ? context.evals.get(context.ctx.sandboxGlobal[b]) : void 0;
+          if (rep) {
+            done(void 0, rep);
+            return;
+          }
+        }
+        if (prop.context && prop.context[b] === globalThis) {
+          done(void 0, context.ctx.globalScope.get("this"));
+          return;
         }
-        const val2 = prop.context ? prop.context[prop.prop] : void 0;
-        const p2 = getGlobalProp(val2, context, prop) || prop;
-        done(void 0, p2);
+        done(void 0, prop);
         return;
       } else if (a === void 0) {
-        throw new TypeError(`Cannot read properties of undefined (reading '${b.toString()}')`);
+        throw new utils.SandboxError("Cannot get property '" + b + "' of undefined");
       }
-      if (!hasPossibleProperties(a)) {
+      if (type !== "object") {
+        if (type === "number") {
+          a = new Number(a);
+        } else if (type === "string") {
+          a = new String(a);
+        } else if (type === "boolean") {
+          a = new Boolean(a);
+        }
+      } else if (typeof a.hasOwnProperty === "undefined") {
         done(void 0, new utils.Prop(void 0, b));
         return;
       }
-      const prototypeAccess = typeof a === "function" || !utils.hasOwnProperty(a, b);
+      const isFunction2 = type === "function";
+      const prototypeAccess = isFunction2 || !(a.hasOwnProperty(b) || typeof b === "number");
       if (context.ctx.options.audit && prototypeAccess) {
-        let prot = Object.getPrototypeOf(a);
-        do {
-          if (utils.hasOwnProperty(prot, b)) {
-            if (context.ctx.auditReport && !context.ctx.auditReport.prototypeAccess[prot.constructor.name]) {
-              context.ctx.auditReport.prototypeAccess[prot.constructor.name] = /* @__PURE__ */ new Set();
+        if (typeof b === "string") {
+          let prot = Object.getPrototypeOf(a);
+          do {
+            if (prot.hasOwnProperty(b)) {
+              if (context.ctx.auditReport && !context.ctx.auditReport.prototypeAccess[prot.constructor.name]) {
+                context.ctx.auditReport.prototypeAccess[prot.constructor.name] = /* @__PURE__ */ new Set();
+              }
+              context.ctx.auditReport?.prototypeAccess[prot.constructor.name].add(b);
             }
-            context.ctx.auditReport?.prototypeAccess[prot.constructor.name].add(b);
-          }
-        } while (prot = Object.getPrototypeOf(prot));
+          } while (prot = Object.getPrototypeOf(prot));
+        }
       }
       if (prototypeAccess) {
-        if (typeof a === "function") {
-          if (utils.hasOwnProperty(a, b)) {
+        if (isFunction2) {
+          if (!["name", "length", "constructor"].includes(b) && a.hasOwnProperty(b)) {
             const whitelist = context.ctx.prototypeWhitelist.get(a.prototype);
             const replace = context.ctx.options.prototypeReplacements.get(a);
             if (replace) {
               done(void 0, new utils.Prop(replace(a, true), b));
               return;
             }
-            if (!(whitelist && (!whitelist.size || whitelist.has(b))) && !context.ctx.sandboxedFunctions.has(a)) {
-              throw new utils.SandboxAccessError(`Static method or property access not permitted: ${a.name}.${b.toString()}`);
+            if (!(whitelist && (!whitelist.size || whitelist.has(b)))) {
+              throw new utils.SandboxError(`Static method or property access not permitted: ${a.name}.${b}`);
             }
           }
         }
-        let prot = a;
-        while (prot = Object.getPrototypeOf(prot)) {
-          if (utils.hasOwnProperty(prot, b) || b === "__proto__") {
-            const whitelist = context.ctx.prototypeWhitelist.get(prot);
-            const replace = context.ctx.options.prototypeReplacements.get(prot.constructor);
-            if (replace) {
-              done(void 0, new utils.Prop(replace(a, false), b));
-              return;
-            }
-            if (whitelist && (!whitelist.size || whitelist.has(b)) || context.ctx.sandboxedFunctions.has(prot.constructor)) {
-              break;
-            }
-            if (b === "__proto__") {
-              throw new utils.SandboxAccessError(`Access to prototype of global object is not permitted`);
+        if (b !== "constructor") {
+          let prot = a;
+          while (prot = Object.getPrototypeOf(prot)) {
+            if (prot.hasOwnProperty(b)) {
+              const whitelist = context.ctx.prototypeWhitelist.get(prot);
+              const replace = context.ctx.options.prototypeReplacements.get(prot.constuctor);
+              if (replace) {
+                done(void 0, new utils.Prop(replace(a, false), b));
+                return;
+              }
+              if (whitelist && (!whitelist.size || whitelist.has(b))) {
+                break;
+              }
+              throw new utils.SandboxError(`Method or property access not permitted: ${prot.constructor.name}.${b}`);
             }
-            throw new utils.SandboxAccessError(`Method or property access not permitted: ${prot.constructor.name}.${b.toString()}`);
           }
         }
       }
-      const val = a[b];
-      if (typeof a === "function") {
-        if (b === "prototype" && !context.ctx.sandboxedFunctions.has(a)) {
-          throw new utils.SandboxAccessError(`Access to prototype of global object is not permitted`);
-        }
-      }
-      if (b === "__proto__" && !context.ctx.sandboxedFunctions.has(val?.constructor)) {
-        throw new utils.SandboxAccessError(`Access to prototype of global object is not permitted`);
-      }
-      const p = getGlobalProp(val, context);
-      if (p) {
-        done(void 0, p);
+      if (context.evals.has(a[b])) {
+        done(void 0, context.evals.get(a[b]));
         return;
       }
-      const g = obj instanceof utils.Prop && obj.isGlobal || typeof a === "function" && !context.ctx.sandboxedFunctions.has(a) || context.ctx.globalsWhitelist.has(a);
-      done(void 0, new utils.Prop(a, b, false, g, false));
-    });
-    function getGlobalProp(val, context, prop) {
-      if (!val)
+      if (a[b] === globalThis) {
+        done(void 0, context.ctx.globalScope.get("this"));
         return;
-      const isFunc = typeof val === "function";
-      if (val instanceof utils.Prop) {
-        if (!prop) {
-          prop = val;
-        }
-        val = val.get(context);
-      }
-      const p = prop?.prop || "prop";
-      if (val === globalThis) {
-        return new utils.Prop({
-          [p]: context.ctx.sandboxGlobal
-        }, p, prop?.isConst || false, false, prop?.isVariable || false);
-      }
-      const evl = isFunc && context.evals.get(val);
-      if (evl) {
-        return new utils.Prop({
-          [p]: evl
-        }, p, prop?.isConst || false, true, prop?.isVariable || false);
       }
-    }
-    addOps(5, ({ done, a, b, obj, context }) => {
+      const g = obj.isGlobal || isFunction2 && !sandboxedFunctions.has(a) || context.ctx.globalsWhitelist.has(a);
+      done(void 0, new utils.Prop(a, b, false, g));
+    });
+    addOps(5, (exec6, done, ticks, a, b, obj, context) => {
       if (context.ctx.options.forbidFunctionCalls)
-        throw new utils.SandboxCapabilityError("Function invocations are not allowed");
+        throw new utils.SandboxError("Function invocations are not allowed");
       if (typeof a !== "function") {
-        throw new TypeError(`${typeof obj?.prop === "symbol" ? "Symbol" : obj?.prop} is not a function`);
+        throw new TypeError(`${typeof obj.prop === "symbol" ? "Symbol" : obj.prop} is not a function`);
       }
       const vals = b.map((item) => {
         if (item instanceof SpreadArray) {
@@ -13023,9 +12948,7 @@ var require_executor = __commonJS({
         }
       }).flat().map((item) => valueOrProp(item, context));
       if (typeof obj === "function") {
-        let ret2 = obj(...vals);
-        ret2 = getGlobalProp(ret2, context) || ret2;
-        done(void 0, ret2);
+        done(void 0, obj(...vals));
         return;
       }
       if (obj.context[obj.prop] === JSON.stringify && context.getSubscriptions.size) {
@@ -13097,11 +13020,9 @@ var require_executor = __commonJS({
         }
       }
       obj.get(context);
-      let ret = obj.context[obj.prop](...vals);
-      ret = getGlobalProp(ret, context) || ret;
-      done(void 0, ret);
+      done(void 0, obj.context[obj.prop](...vals));
     });
-    addOps(22, ({ done, b }) => {
+    addOps(22, (exec6, done, ticks, a, b) => {
       let res = {};
       for (const item of b) {
         if (item.key instanceof SpreadObject) {
@@ -13112,8 +13033,8 @@ var require_executor = __commonJS({
       }
       done(void 0, res);
     });
-    addOps(6, ({ done, a, b }) => done(void 0, new KeyVal(a, b)));
-    addOps(12, ({ done, b, context }) => {
+    addOps(6, (exec6, done, ticks, a, b) => done(void 0, new KeyVal(a, b)));
+    addOps(12, (exec6, done, ticks, a, b, obj, context) => {
       const items = b.map((item) => {
         if (item instanceof SpreadArray) {
           return [...item.item];
@@ -13123,8 +13044,8 @@ var require_executor = __commonJS({
       }).flat().map((item) => valueOrProp(item, context));
       done(void 0, items);
     });
-    addOps(23, ({ done, b }) => done(void 0, b));
-    addOps(35, ({ done, b }) => {
+    addOps(23, (exec6, done, ticks, a, b) => done(void 0, b));
+    addOps(35, (exec6, done, ticks, a, b) => {
       switch (b) {
         case "true":
           return done(void 0, true);
@@ -13141,18 +13062,18 @@ var require_executor = __commonJS({
       }
       done(new Error("Unknown symbol: " + b));
     });
-    addOps(7, ({ done, b }) => done(void 0, Number(b.replace(/_/g, ""))));
-    addOps(83, ({ done, b }) => done(void 0, BigInt(b.replace(/_/g, ""))));
-    addOps(2, ({ done, b, context }) => done(void 0, context.constants.strings[parseInt(b)]));
-    addOps(85, ({ done, b, context }) => {
+    addOps(7, (exec6, done, ticks, a, b) => done(void 0, Number(b)));
+    addOps(83, (exec6, done, ticks, a, b) => done(void 0, BigInt(b)));
+    addOps(2, (exec6, done, ticks, a, b, obj, context) => done(void 0, context.constants.strings[parseInt(b)]));
+    addOps(86, (exec6, done, ticks, a, b, obj, context) => {
       const reg = context.constants.regexes[parseInt(b)];
       if (!context.ctx.globalsWhitelist.has(RegExp)) {
-        throw new utils.SandboxCapabilityError("Regex not permitted");
+        throw new utils.SandboxError("Regex not permitted");
       } else {
         done(void 0, new RegExp(reg.regex, reg.flags));
       }
     });
-    addOps(84, ({ exec: exec6, done, ticks, b, context, scope }) => {
+    addOps(84, (exec6, done, ticks, a, b, obj, context, scope) => {
       const item = context.constants.literals[parseInt(b)];
       const [, name, js] = item;
       const found = [];
@@ -13164,13 +13085,12 @@ var require_executor = __commonJS({
           resnums.push(f[3]);
         }
       }
-      exec6(ticks, found, scope, context, (...args) => {
+      exec6(ticks, found, scope, context, (err, processed) => {
         const reses = {};
-        if (args.length === 1) {
-          done(args[0]);
+        if (err) {
+          done(err);
           return;
         }
-        const processed = args[1];
         for (const i of Object.keys(processed)) {
           const num = resnums[i];
           reses[num] = processed[i];
@@ -13183,146 +13103,115 @@ var require_executor = __commonJS({
         }));
       });
     });
-    addOps(18, ({ done, b }) => {
+    addOps(18, (exec6, done, ticks, a, b) => {
       done(void 0, new SpreadArray(b));
     });
-    addOps(17, ({ done, b }) => {
+    addOps(17, (exec6, done, ticks, a, b) => {
       done(void 0, new SpreadObject(b));
     });
-    addOps(24, ({ done, b }) => done(void 0, !b));
-    addOps(64, ({ done, b }) => done(void 0, ~b));
-    addOps(25, ({ done, obj, context }) => {
+    addOps(24, (exec6, done, ticks, a, b) => done(void 0, !b));
+    addOps(64, (exec6, done, ticks, a, b) => done(void 0, ~b));
+    addOps(25, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, ++obj.context[obj.prop]);
     });
-    addOps(26, ({ done, obj, context }) => {
+    addOps(26, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop]++);
     });
-    addOps(27, ({ done, obj, context }) => {
+    addOps(27, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, --obj.context[obj.prop]);
     });
-    addOps(28, ({ done, obj, context }) => {
+    addOps(28, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop]--);
     });
-    addOps(9, ({ done, b, obj, context, scope, bobj }) => {
+    addOps(9, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
-      obj.isGlobal = bobj?.isGlobal || false;
-      if (obj.isVariable) {
-        const s = scope.getWhereValScope(obj.prop, obj.prop === "this");
-        if (s === null) {
-          throw new ReferenceError(`Cannot assign to undeclared variable '${obj.prop.toString()}'`);
-        }
-        s.set(obj.prop, b);
-        if (obj.isGlobal) {
-          s.globals[obj.prop.toString()] = true;
-        } else {
-          delete s.globals[obj.prop.toString()];
-        }
-        done(void 0, b);
-        return;
-      }
       done(void 0, obj.context[obj.prop] = b);
     });
-    addOps(66, ({ done, b, obj, context }) => {
+    addOps(66, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] += b);
     });
-    addOps(65, ({ done, b, obj, context }) => {
+    addOps(65, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] -= b);
     });
-    addOps(67, ({ done, b, obj, context }) => {
+    addOps(67, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] /= b);
     });
-    addOps(69, ({ done, b, obj, context }) => {
+    addOps(69, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] *= b);
     });
-    addOps(68, ({ done, b, obj, context }) => {
+    addOps(68, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] **= b);
     });
-    addOps(70, ({ done, b, obj, context }) => {
+    addOps(70, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] %= b);
     });
-    addOps(71, ({ done, b, obj, context }) => {
+    addOps(71, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] ^= b);
     });
-    addOps(72, ({ done, b, obj, context }) => {
+    addOps(72, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] &= b);
     });
-    addOps(73, ({ done, b, obj, context }) => {
+    addOps(73, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] |= b);
     });
-    addOps(76, ({ done, b, obj, context }) => {
+    addOps(76, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] <<= b);
     });
-    addOps(75, ({ done, b, obj, context }) => {
+    addOps(75, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
       done(void 0, obj.context[obj.prop] >>= b);
     });
-    addOps(74, ({ done, b, obj, context }) => {
-      assignCheck(obj, context);
-      done(void 0, obj.context[obj.prop] >>>= b);
-    });
-    addOps(90, ({ done, b, obj, context }) => {
-      var _a, _b;
-      assignCheck(obj, context);
-      done(void 0, (_a = obj.context)[_b = obj.prop] && (_a[_b] = b));
-    });
-    addOps(91, ({ done, b, obj, context }) => {
-      var _a, _b;
-      assignCheck(obj, context);
-      done(void 0, (_a = obj.context)[_b = obj.prop] || (_a[_b] = b));
-    });
-    addOps(92, ({ done, b, obj, context }) => {
-      var _a, _b;
+    addOps(74, (exec6, done, ticks, a, b, obj, context) => {
       assignCheck(obj, context);
-      done(void 0, (_a = obj.context)[_b = obj.prop] ?? (_a[_b] = b));
+      done(void 0, obj.context[obj.prop] >>= b);
     });
-    addOps(57, ({ done, a, b }) => done(void 0, a > b));
-    addOps(56, ({ done, a, b }) => done(void 0, a < b));
-    addOps(55, ({ done, a, b }) => done(void 0, a >= b));
-    addOps(54, ({ done, a, b }) => done(void 0, a <= b));
-    addOps(52, ({ done, a, b }) => done(void 0, a == b));
-    addOps(32, ({ done, a, b }) => done(void 0, a === b));
-    addOps(53, ({ done, a, b }) => done(void 0, a != b));
-    addOps(31, ({ done, a, b }) => done(void 0, a !== b));
-    addOps(29, ({ done, a, b }) => done(void 0, a && b));
-    addOps(30, ({ done, a, b }) => done(void 0, a || b));
-    addOps(89, ({ done, a, b }) => done(void 0, a ?? b));
-    addOps(77, ({ done, a, b }) => done(void 0, a & b));
-    addOps(78, ({ done, a, b }) => done(void 0, a | b));
-    addOps(33, ({ done, a, b }) => done(void 0, a + b));
-    addOps(47, ({ done, a, b }) => done(void 0, a - b));
-    addOps(59, ({ done, b }) => done(void 0, +b));
-    addOps(58, ({ done, b }) => done(void 0, -b));
-    addOps(48, ({ done, a, b }) => done(void 0, a / b));
-    addOps(49, ({ done, a, b }) => done(void 0, a ** b));
-    addOps(79, ({ done, a, b }) => done(void 0, a ^ b));
-    addOps(50, ({ done, a, b }) => done(void 0, a * b));
-    addOps(51, ({ done, a, b }) => done(void 0, a % b));
-    addOps(80, ({ done, a, b }) => done(void 0, a << b));
-    addOps(81, ({ done, a, b }) => done(void 0, a >> b));
-    addOps(82, ({ done, a, b }) => done(void 0, a >>> b));
-    addOps(60, ({ exec: exec6, done, ticks, b, context, scope }) => {
+    addOps(57, (exec6, done, ticks, a, b) => done(void 0, a > b));
+    addOps(56, (exec6, done, ticks, a, b) => done(void 0, a < b));
+    addOps(55, (exec6, done, ticks, a, b) => done(void 0, a >= b));
+    addOps(54, (exec6, done, ticks, a, b) => done(void 0, a <= b));
+    addOps(52, (exec6, done, ticks, a, b) => done(void 0, a == b));
+    addOps(32, (exec6, done, ticks, a, b) => done(void 0, a === b));
+    addOps(53, (exec6, done, ticks, a, b) => done(void 0, a != b));
+    addOps(31, (exec6, done, ticks, a, b) => done(void 0, a !== b));
+    addOps(29, (exec6, done, ticks, a, b) => done(void 0, a && b));
+    addOps(30, (exec6, done, ticks, a, b) => done(void 0, a || b));
+    addOps(85, (exec6, done, ticks, a, b) => done(void 0, a ?? b));
+    addOps(77, (exec6, done, ticks, a, b) => done(void 0, a & b));
+    addOps(78, (exec6, done, ticks, a, b) => done(void 0, a | b));
+    addOps(33, (exec6, done, ticks, a, b) => done(void 0, a + b));
+    addOps(47, (exec6, done, ticks, a, b) => done(void 0, a - b));
+    addOps(59, (exec6, done, ticks, a, b) => done(void 0, +b));
+    addOps(58, (exec6, done, ticks, a, b) => done(void 0, -b));
+    addOps(48, (exec6, done, ticks, a, b) => done(void 0, a / b));
+    addOps(79, (exec6, done, ticks, a, b) => done(void 0, a ^ b));
+    addOps(50, (exec6, done, ticks, a, b) => done(void 0, a * b));
+    addOps(51, (exec6, done, ticks, a, b) => done(void 0, a % b));
+    addOps(80, (exec6, done, ticks, a, b) => done(void 0, a << b));
+    addOps(81, (exec6, done, ticks, a, b) => done(void 0, a >> b));
+    addOps(82, (exec6, done, ticks, a, b) => done(void 0, a >>> b));
+    addOps(60, (exec6, done, ticks, a, b, obj, context, scope) => {
       exec6(ticks, b, scope, context, (e, prop) => {
         done(void 0, typeof valueOrProp(prop, context));
       });
     });
-    addOps(62, ({ done, a, b }) => done(void 0, a instanceof b));
-    addOps(63, ({ done, a, b }) => done(void 0, a in b));
-    addOps(61, ({ done, context, bobj }) => {
-      if (!(bobj instanceof utils.Prop)) {
+    addOps(62, (exec6, done, ticks, a, b) => done(void 0, a instanceof b));
+    addOps(63, (exec6, done, ticks, a, b) => done(void 0, a in b));
+    addOps(61, (exec6, done, ticks, a, b, obj, context, scope, bobj) => {
+      if (bobj.context === void 0) {
         done(void 0, true);
         return;
       }
@@ -13333,23 +13222,23 @@ var require_executor = __commonJS({
       }
       done(void 0, delete bobj.context?.[bobj.prop]);
     });
-    addOps(8, ({ done, b }) => done(void 0, b));
-    addOps(34, ({ done, a, b, scope, bobj }) => {
-      done(void 0, scope.declare(a, "var", b, bobj?.isGlobal || false));
+    addOps(8, (exec6, done, ticks, a, b) => done(void 0, b));
+    addOps(34, (exec6, done, ticks, a, b, obj, context, scope) => {
+      done(void 0, scope.declare(a, "var", b));
     });
-    addOps(3, ({ done, a, b, scope, bobj }) => {
-      done(void 0, scope.declare(a, "let", b, bobj?.isGlobal || false));
+    addOps(3, (exec6, done, ticks, a, b, obj, context, scope, bobj) => {
+      done(void 0, scope.declare(a, "let", b, bobj && bobj.isGlobal));
     });
-    addOps(4, ({ done, a, b, scope, bobj }) => {
-      done(void 0, scope.declare(a, "const", b, bobj?.isGlobal || false));
+    addOps(4, (exec6, done, ticks, a, b, obj, context, scope) => {
+      done(void 0, scope.declare(a, "const", b));
     });
-    addOps(11, ({ done, ticks, a, b, obj, context, scope }) => {
+    addOps(11, (exec6, done, ticks, a, b, obj, context, scope) => {
       a = [...a];
       if (typeof obj[2] === "string" || obj[2] instanceof utils.CodeString) {
         if (context.allowJit && context.evalContext) {
           obj[2] = b = context.evalContext.lispifyFunction(new utils.CodeString(obj[2]), context.constants);
         } else {
-          throw new utils.SandboxCapabilityError("Unevaluated code detected, JIT not allowed");
+          throw new utils.SandboxError("Unevaluated code detected, JIT not allowed");
         }
       }
       if (a.shift()) {
@@ -13358,18 +13247,18 @@ var require_executor = __commonJS({
         done(void 0, createFunction(a, b, ticks, context, scope));
       }
     });
-    addOps(37, ({ done, ticks, a, b, obj, context, scope }) => {
+    addOps(37, (exec6, done, ticks, a, b, obj, context, scope) => {
       if (typeof obj[2] === "string" || obj[2] instanceof utils.CodeString) {
         if (context.allowJit && context.evalContext) {
           obj[2] = b = context.evalContext.lispifyFunction(new utils.CodeString(obj[2]), context.constants);
         } else {
-          throw new utils.SandboxCapabilityError("Unevaluated code detected, JIT not allowed");
+          throw new utils.SandboxError("Unevaluated code detected, JIT not allowed");
         }
       }
       const isAsync2 = a.shift();
       const name = a.shift();
       let func;
-      if (isAsync2 === 88) {
+      if (isAsync2 === 89) {
         func = createFunctionAsync(a, b, ticks, context, scope, name);
       } else {
         func = createFunction(a, b, ticks, context, scope, name);
@@ -13379,12 +13268,12 @@ var require_executor = __commonJS({
       }
       done(void 0, func);
     });
-    addOps(10, ({ done, ticks, a, b, obj, context, scope }) => {
+    addOps(10, (exec6, done, ticks, a, b, obj, context, scope) => {
       if (typeof obj[2] === "string" || obj[2] instanceof utils.CodeString) {
         if (context.allowJit && context.evalContext) {
           obj[2] = b = context.evalContext.lispifyFunction(new utils.CodeString(obj[2]), context.constants);
         } else {
-          throw new utils.SandboxCapabilityError("Unevaluated code detected, JIT not allowed");
+          throw new utils.SandboxError("Unevaluated code detected, JIT not allowed");
         }
       }
       const isAsync2 = a.shift();
@@ -13393,7 +13282,7 @@ var require_executor = __commonJS({
         scope = new utils.Scope(scope, {});
       }
       let func;
-      if (isAsync2 === 88) {
+      if (isAsync2 === 89) {
         func = createFunctionAsync(a, b, ticks, context, scope, name);
       } else {
         func = createFunction(a, b, ticks, context, scope, name);
@@ -13403,7 +13292,7 @@ var require_executor = __commonJS({
       }
       done(void 0, func);
     });
-    addOps(38, ({ exec: exec6, done, ticks, a, b, context, scope }) => {
+    addOps(38, (exec6, done, ticks, a, b, obj, context, scope) => {
       const [checkFirst, startInternal, getIterator, startStep, step, condition, beforeStep] = a;
       let loop = true;
       const loopScope = new utils.Scope(scope, {});
@@ -13459,27 +13348,26 @@ var require_executor = __commonJS({
         done();
       }
     });
-    addOps(86, ({ done, a, context, inLoopOrSwitch }) => {
+    addOps(87, (exec6, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch) => {
       if (inLoopOrSwitch === "switch" && a === "continue" || !inLoopOrSwitch) {
-        throw new TypeError("Illegal " + a + " statement");
+        throw new utils.SandboxError("Illegal " + a + " statement");
       }
       done(void 0, new ExecReturn(context.ctx.auditReport, void 0, false, a === "break", a === "continue"));
     });
-    addOps(13, ({ exec: exec6, done, ticks, a, b, context, scope, inLoopOrSwitch }) => {
+    addOps(13, (exec6, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch) => {
       exec6(ticks, valueOrProp(a, context) ? b.t : b.f, scope, context, done, inLoopOrSwitch);
     });
-    addOps(15, ({ exec: exec6, done, ticks, a, b, context, scope }) => {
-      exec6(ticks, valueOrProp(a, context) ? b.t : b.f, scope, context, done, void 0);
+    addOps(15, (exec6, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch) => {
+      exec6(ticks, valueOrProp(a, context) ? b.t : b.f, scope, context, done, inLoopOrSwitch);
     });
-    addOps(16, ({ done, a, b }) => done(void 0, new If(a, b)));
-    addOps(14, ({ done, a, b }) => done(void 0, new If(a, b)));
-    addOps(40, ({ exec: exec6, done, ticks, a, b, context, scope }) => {
-      exec6(ticks, a, scope, context, (...args) => {
-        if (args.length === 1) {
-          done(args[0]);
+    addOps(16, (exec6, done, ticks, a, b) => done(void 0, new If(a, b)));
+    addOps(14, (exec6, done, ticks, a, b) => done(void 0, new If(a, b)));
+    addOps(40, (exec6, done, ticks, a, b, obj, context, scope) => {
+      exec6(ticks, a, scope, context, (err, toTest) => {
+        if (err) {
+          done(err);
           return;
         }
-        let toTest = args[1];
         toTest = valueOrProp(toTest, context);
         if (exec6 === execSync) {
           let res;
@@ -13527,79 +13415,34 @@ var require_executor = __commonJS({
         }
       });
     });
-    addOps(39, ({ exec: exec6, done, ticks, a, b, context, scope, inLoopOrSwitch }) => {
+    addOps(39, (exec6, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch) => {
       const [exception, catchBody, finallyBody] = b;
-      executeTreeWithDone(exec6, (...tryArgs) => {
-        const tryHadError = tryArgs.length === 1;
-        const tryError = tryHadError ? tryArgs[0] : void 0;
-        const tryResult = !tryHadError && tryArgs.length > 1 ? tryArgs[1] : void 0;
-        const executeFinallyAndComplete = (hadError, errorOrResult) => {
-          if (finallyBody && finallyBody.length > 0) {
-            executeTreeWithDone(exec6, (...finallyArgs) => {
-              const finallyHadError = finallyArgs.length === 1;
-              const finallyResult = !finallyHadError && finallyArgs.length > 1 ? finallyArgs[1] : void 0;
-              if (finallyHadError) {
-                done(finallyArgs[0]);
-                return;
-              }
-              if (finallyResult instanceof ExecReturn && (finallyResult.returned || finallyResult.breakLoop || finallyResult.continueLoop)) {
-                done(void 0, finallyResult);
-                return;
-              }
-              if (hadError) {
-                done(errorOrResult);
-              } else if (errorOrResult instanceof ExecReturn) {
-                if (errorOrResult.returned || errorOrResult.breakLoop || errorOrResult.continueLoop) {
-                  done(void 0, errorOrResult);
-                } else {
-                  done();
-                }
-              } else {
-                done();
-              }
-            }, ticks, context, finallyBody, [new utils.Scope(scope, {})], inLoopOrSwitch);
+      executeTreeWithDone(exec6, (err, res) => {
+        executeTreeWithDone(exec6, (e) => {
+          if (e)
+            done(e);
+          else if (err) {
+            executeTreeWithDone(exec6, done, ticks, context, catchBody, [new utils.Scope(scope)], inLoopOrSwitch);
           } else {
-            if (hadError) {
-              done(errorOrResult);
-            } else if (errorOrResult instanceof ExecReturn) {
-              if (errorOrResult.returned || errorOrResult.breakLoop || errorOrResult.continueLoop) {
-                done(void 0, errorOrResult);
-              } else {
-                done();
-              }
-            } else {
-              done();
-            }
+            done(void 0, res);
           }
-        };
-        if (tryHadError && catchBody && catchBody.length > 0) {
-          const sc = {};
-          if (exception)
-            sc[exception] = tryError;
-          executeTreeWithDone(exec6, (...catchArgs) => {
-            const catchHadError = catchArgs.length === 1;
-            const catchErrorOrResult = catchHadError ? catchArgs[0] : catchArgs.length > 1 ? catchArgs[1] : void 0;
-            executeFinallyAndComplete(catchHadError, catchErrorOrResult);
-          }, ticks, context, catchBody, [new utils.Scope(scope, sc)], inLoopOrSwitch);
-        } else {
-          executeFinallyAndComplete(tryHadError, tryHadError ? tryError : tryResult);
-        }
+        }, ticks, context, finallyBody, [new utils.Scope(scope, {})]);
       }, ticks, context, a, [new utils.Scope(scope)], inLoopOrSwitch);
     });
-    addOps(87, ({ done }) => {
+    addOps(88, (exec6, done) => {
       done();
     });
-    addOps(45, ({ done, a, b, context }) => {
-      if (!context.ctx.globalsWhitelist.has(a) && !context.ctx.sandboxedFunctions.has(a)) {
-        throw new utils.SandboxAccessError(`Object construction not allowed: ${a.constructor.name}`);
+    addOps(45, (exec6, done, ticks, a, b, obj, context) => {
+      if (!context.ctx.globalsWhitelist.has(a) && !sandboxedFunctions.has(a)) {
+        throw new utils.SandboxError(`Object construction not allowed: ${a.constructor.name}`);
       }
       done(void 0, new a(...b));
     });
-    addOps(46, ({ done, b }) => {
+    addOps(46, (exec6, done, ticks, a, b) => {
       done(b);
     });
-    addOps(43, ({ done, a }) => done(void 0, a.pop()));
-    addOps(0, ({ done }) => done());
+    addOps(43, (exec6, done, ticks, a) => done(void 0, a.pop()));
+    addOps(0, (exec6, done) => done());
     function valueOrProp(a, context) {
       if (a instanceof utils.Prop)
         return a.get(context);
@@ -13617,7 +13460,13 @@ var require_executor = __commonJS({
     function _execManySync(ticks, tree, done, scope, context, inLoopOrSwitch) {
       const ret = [];
       for (let i = 0; i < tree.length; i++) {
-        let res = syncDone((d) => execSync(ticks, tree[i], scope, context, d, inLoopOrSwitch)).result;
+        let res;
+        try {
+          res = syncDone((d) => execSync(ticks, tree[i], scope, context, d, inLoopOrSwitch)).result;
+        } catch (e) {
+          done(e);
+          return;
+        }
         if (res instanceof ExecReturn && (res.returned || res.breakLoop || res.continueLoop)) {
           done(void 0, res);
           return;
@@ -13657,13 +13506,13 @@ var require_executor = __commonJS({
       let isInstant = false;
       let instant;
       const p = new Promise((resolve8, reject2) => {
-        callback((...args) => {
-          if (args.length === 1)
-            reject2(args[0]);
+        callback((err, result) => {
+          if (err)
+            reject2(err);
           else {
             isInstant = true;
-            instant = args[1];
-            resolve8({ result: args[1] });
+            instant = result;
+            resolve8({ result });
           }
         });
       });
@@ -13676,19 +13525,19 @@ var require_executor = __commonJS({
     function syncDone(callback) {
       let result;
       let err;
-      callback((...args) => {
-        err = args.length === 1 ? { error: args[0] } : void 0;
-        result = args[1];
+      callback((e, r) => {
+        err = e;
+        result = r;
       });
       if (err)
-        throw err.error;
+        throw err;
       return { result };
     }
     async function execAsync4(ticks, tree, scope, context, doneOriginal, inLoopOrSwitch) {
       let done = doneOriginal;
       const p = new Promise((resolve8) => {
-        done = (...args) => {
-          doneOriginal(...args);
+        done = (e, r) => {
+          doneOriginal(e, r);
           resolve8();
         };
       });
@@ -13724,10 +13573,6 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
-        if (op === 89 && a !== void 0 && a !== null) {
-          done(void 0, a);
-          return;
-        }
         let bobj;
         try {
           let ad;
@@ -13746,28 +13591,35 @@ var require_executor = __commonJS({
         if (b === optional) {
           b = void 0;
         }
-        performOp({
-          op,
-          exec: execAsync4,
-          done,
-          ticks,
-          a,
-          b,
-          obj,
-          context,
-          scope,
-          bobj,
-          inLoopOrSwitch,
-          tree
-        });
+        if (ops.has(op)) {
+          try {
+            ops.get(op)?.(execAsync4, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch);
+          } catch (err) {
+            done(err);
+          }
+        } else {
+          done(new SyntaxError("Unknown operator: " + op));
+        }
       }
       await p;
     }
     function execSync(ticks, tree, scope, context, done, inLoopOrSwitch) {
       if (!_execNoneRecurse(ticks, tree, scope, context, done, false, inLoopOrSwitch) && utils.isLisp(tree)) {
         let op = tree[0];
-        let obj = syncDone((d) => execSync(ticks, tree[1], scope, context, d, inLoopOrSwitch)).result;
-        let a = obj instanceof utils.Prop ? obj.get(context) : obj;
+        let obj;
+        try {
+          obj = syncDone((d) => execSync(ticks, tree[1], scope, context, d, inLoopOrSwitch)).result;
+        } catch (e) {
+          done(e);
+          return;
+        }
+        let a = obj;
+        try {
+          a = obj instanceof utils.Prop ? obj.get(context) : obj;
+        } catch (e) {
+          done(e);
+          return;
+        }
         if (op === 20 || op === 21) {
           if (a === void 0 || a === null) {
             done(void 0, optional);
@@ -13783,129 +13635,31 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
-        if (op === 89 && a !== void 0 && a !== null) {
-          done(void 0, a);
+        let bobj;
+        try {
+          bobj = syncDone((d) => execSync(ticks, tree[2], scope, context, d, inLoopOrSwitch)).result;
+        } catch (e) {
+          done(e);
+          return;
+        }
+        let b = bobj;
+        try {
+          b = bobj instanceof utils.Prop ? bobj.get(context) : bobj;
+        } catch (e) {
+          done(e);
           return;
         }
-        let bobj = syncDone((d) => execSync(ticks, tree[2], scope, context, d, inLoopOrSwitch)).result;
-        let b = bobj instanceof utils.Prop ? bobj.get(context) : bobj;
         if (b === optional) {
           b = void 0;
         }
-        performOp({
-          op,
-          exec: execSync,
-          done,
-          ticks,
-          a,
-          b,
-          obj,
-          context,
-          scope,
-          bobj,
-          inLoopOrSwitch,
-          tree
-        });
-      }
-    }
-    function checkHaltExpectedTicks(params, expectTicks = 0) {
-      const sandbox = params.context.ctx.sandbox;
-      const options = params.context.ctx.options;
-      const { ticks, scope, context, done, op } = params;
-      if (sandbox.halted) {
-        const sub = sandbox.subscribeResume(() => {
-          sub.unsubscribe();
+        if (ops.has(op)) {
           try {
-            const o = ops.get(op);
-            if (!o) {
-              done(new SyntaxError("Unknown operator: " + op));
-              return;
-            }
-            o(params);
+            ops.get(op)?.(execSync, done, ticks, a, b, obj, context, scope, bobj, inLoopOrSwitch);
           } catch (err) {
-            if (options.haltOnSandboxError && err instanceof utils.SandboxError) {
-              const sub2 = sandbox.subscribeResume(() => {
-                sub2.unsubscribe();
-                done(err);
-              });
-              sandbox.haltExecution({
-                error: err,
-                ticks,
-                scope,
-                context
-              });
-            } else {
-              done(err);
-            }
-          }
-        });
-        return true;
-      } else if (ticks.tickLimit && ticks.tickLimit <= ticks.ticks + BigInt(expectTicks)) {
-        const sub = sandbox.subscribeResume(() => {
-          sub.unsubscribe();
-          try {
-            const o = ops.get(op);
-            if (!o) {
-              done(new SyntaxError("Unknown operator: " + op));
-              return;
-            }
-            o(params);
-          } catch (err) {
-            if (context.ctx.options.haltOnSandboxError && err instanceof utils.SandboxError) {
-              const sub2 = sandbox.subscribeResume(() => {
-                sub2.unsubscribe();
-                done(err);
-              });
-              sandbox.haltExecution({
-                error: err,
-                ticks,
-                scope,
-                context
-              });
-            } else {
-              done(err);
-            }
-          }
-        });
-        const error = new utils.SandboxExecutionQuotaExceededError("Execution quota exceeded");
-        sandbox.haltExecution({
-          error,
-          ticks,
-          scope,
-          context
-        });
-        return true;
-      }
-      return false;
-    }
-    function performOp(params) {
-      const { done, op, ticks, context, scope } = params;
-      ticks.ticks++;
-      const sandbox = context.ctx.sandbox;
-      if (checkHaltExpectedTicks(params)) {
-        return;
-      }
-      try {
-        const o = ops.get(op);
-        if (!o) {
-          done(new utils.SandboxExecutionTreeError("Unknown operator: " + op));
-          return;
-        }
-        o(params);
-      } catch (err) {
-        if (context.ctx.options.haltOnSandboxError && err instanceof utils.SandboxError) {
-          const sub = sandbox.subscribeResume(() => {
-            sub.unsubscribe();
             done(err);
-          });
-          sandbox.haltExecution({
-            error: err,
-            ticks,
-            scope,
-            context
-          });
+          }
         } else {
-          done(err);
+          done(new SyntaxError("Unknown operator: " + op));
         }
       }
     }
@@ -13923,9 +13677,20 @@ var require_executor = __commonJS({
     var currentTicks = { current: { ticks: BigInt(0) } };
     function _execNoneRecurse(ticks, tree, scope, context, done, isAsync2, inLoopOrSwitch) {
       const exec6 = isAsync2 ? execAsync4 : execSync;
+      if (context.ctx.options.executionQuota && context.ctx.options.executionQuota <= ticks.ticks) {
+        if (!(typeof context.ctx.options.onExecutionQuotaReached === "function" && context.ctx.options.onExecutionQuotaReached(ticks, scope, context, tree))) {
+          done(new utils.SandboxError("Execution quota exceeded"));
+          return true;
+        }
+      }
+      ticks.ticks++;
       currentTicks.current = ticks;
       if (tree instanceof utils.Prop) {
-        done(void 0, tree.get(context));
+        try {
+          done(void 0, tree.get(context));
+        } catch (err) {
+          done(err);
+        }
       } else if (tree === optional) {
         done();
       } else if (Array.isArray(tree) && !utils.isLisp(tree)) {
@@ -13940,36 +13705,27 @@ var require_executor = __commonJS({
         execMany(ticks, exec6, tree[1], done, scope, context, inLoopOrSwitch);
       } else if (tree[0] === 44) {
         if (!isAsync2) {
-          done(new SyntaxError("Illegal use of 'await', must be inside async function"));
+          done(new utils.SandboxError("Illegal use of 'await', must be inside async function"));
         } else if (context.ctx.prototypeWhitelist?.has(Promise.prototype)) {
-          execAsync4(ticks, tree[1], scope, context, async (...args) => {
-            if (args.length === 1)
-              done(args[0]);
+          execAsync4(ticks, tree[1], scope, context, async (e, r) => {
+            if (e)
+              done(e);
             else
               try {
-                done(void 0, await valueOrProp(args[1], context));
+                done(void 0, await valueOrProp(r, context));
               } catch (err) {
                 done(err);
               }
           }, inLoopOrSwitch).catch(done);
         } else {
-          done(new utils.SandboxCapabilityError("Async/await is not permitted"));
+          done(new utils.SandboxError("Async/await is not permitted"));
         }
       } else if (unexecTypes.has(tree[0])) {
-        performOp({
-          op: tree[0],
-          exec: exec6,
-          done,
-          ticks,
-          a: tree[1],
-          b: tree[2],
-          obj: tree,
-          tree,
-          context,
-          scope,
-          bobj: void 0,
-          inLoopOrSwitch
-        });
+        try {
+          ops.get(tree[0])?.(exec6, done, ticks, tree[1], tree[2], tree, context, scope, void 0, inLoopOrSwitch);
+        } catch (err) {
+          done(err);
+        }
       } else {
         return false;
       }
@@ -14022,17 +13778,15 @@ var require_executor = __commonJS({
         let err;
         const current2 = executionTree[i];
         try {
-          execSync(ticks, current2, scope, context, (...args) => {
-            if (args.length === 1)
-              err = { error: args[0] };
-            else
-              res = args[1];
+          execSync(ticks, current2, scope, context, (e, r) => {
+            err = e;
+            res = r;
           }, inLoopOrSwitch);
         } catch (e) {
-          err = { error: e };
+          err = e;
         }
         if (err) {
-          done(err.error);
+          done(err);
           return;
         }
         if (res instanceof ExecReturn) {
@@ -14055,17 +13809,15 @@ var require_executor = __commonJS({
         let err;
         const current2 = executionTree[i];
         try {
-          await execAsync4(ticks, current2, scope, context, (...args) => {
-            if (args.length === 1)
-              err = { error: args[0] };
-            else
-              res = args[1];
+          await execAsync4(ticks, current2, scope, context, (e, r) => {
+            err = e;
+            res = r;
           }, inLoopOrSwitch);
         } catch (e) {
-          err = { error: e };
+          err = e;
         }
         if (err) {
-          done(err.error);
+          done(err);
           return;
         }
         if (res instanceof ExecReturn) {
@@ -14096,6 +13848,7 @@ var require_executor = __commonJS({
     exports2.executeTree = executeTree;
     exports2.executeTreeAsync = executeTreeAsync;
     exports2.ops = ops;
+    exports2.sandboxedFunctions = sandboxedFunctions;
     exports2.syncDone = syncDone;
   }
 });
@@ -14210,29 +13963,23 @@ var require_parser = __commonJS({
     var expectTypes = {
       splitter: {
         types: {
-          power: /^(\*\*)(?!=)/,
-          opHigh: /^(\/|\*(?!\*)|%)(?!=)/,
+          opHigh: /^(\/|\*\*|\*(?!\*)|%)(?!=)/,
           op: /^(\+(?!(\+))|-(?!(-)))(?!=)/,
           comparitor: /^(<=|>=|<(?!<)|>(?!>)|!==|!=(?!=)|===|==)/,
-          bitwiseShift: /^(<<|>>(?!>)|>>>)(?!=)/,
-          bitwiseAnd: /^(&(?!&))(?!=)/,
-          bitwiseXor: /^(\^)(?!=)/,
-          bitwiseOr: /^(\|(?!\|))(?!=)/,
-          boolOpAnd: /^(&&)(?!=)/,
-          boolOpOr: /^(\|\|(?!=)|instanceof(?![\w$])|in(?![\w$]))/,
-          nullishCoalescing: /^\?\?(?!=)/
+          boolOp: /^(&&|\|\||\?\?|instanceof(?![\w$])|in(?![\w$]))/,
+          bitwise: /^(&(?!&)|\|(?!\|)|\^|<<|>>(?!>)|>>>)(?!=)/
         },
         next: ["modifier", "value", "prop", "incrementerBefore"]
       },
       inlineIf: {
         types: {
-          inlineIf: /^\?(?!\.(?!\d))/
+          inlineIf: /^\?(?!\?|\.(?!\d))/
         },
         next: ["expEnd"]
       },
       assignment: {
         types: {
-          assignModify: /^(-=|\+=|\/=|\*\*=|\*=|%=|\^=|&=|\|=|>>>=|>>=|<<=|&&=|\|\|=|\?\?=)/,
+          assignModify: /^(-=|\+=|\/=|\*\*=|\*=|%=|\^=|&=|\|=|>>>=|>>=|<<=)/,
           assign: /^(=)(?!=)/
         },
         next: ["modifier", "value", "prop", "incrementerBefore"]
@@ -14244,8 +13991,7 @@ var require_parser = __commonJS({
       expEdge: {
         types: {
           call: /^(\?\.)?[(]/,
-          incrementerAfter: /^(\+\+|--)/,
-          taggedTemplate: /^`(\d+)`/
+          incrementerAfter: /^(\+\+|--)/
         },
         next: ["splitter", "expEdge", "dot", "inlineIf", "expEnd"]
       },
@@ -14277,7 +14023,7 @@ var require_parser = __commonJS({
         types: {
           createObject: /^\{/,
           createArray: /^\[/,
-          number: /^(0b[01]+(_[01]+)*|0o[0-7]+(_[0-7]+)*|0x[\da-f]+(_[\da-f]+)*|(\d+(_\d+)*(\.\d+(_\d+)*)?|\.\d+(_\d+)*))(e[+-]?\d+(_\d+)*)?(n)?(?!\d)/i,
+          number: /^(0x[\da-f]+(_[\da-f]+)*|(\d+(_\d+)*(\.\d+(_\d+)*)?|\.\d+(_\d+)*))(e[+-]?\d+(_\d+)*)?(n)?(?!\d)/i,
           string: /^"(\d+)"/,
           literal: /^`(\d+)`/,
           regex: /^\/(\d+)\/r(?![\w$])/,
@@ -14385,8 +14131,6 @@ var require_parser = __commonJS({
       let isOneLiner = false;
       let i;
       let lastInertedSemi = false;
-      let seenKeyword = false;
-      let skipNextWord = false;
       for (i = 0; i < part.length && !done; i++) {
         let char = part.char(i);
         if (quote === '"' || quote === "'" || quote === "`") {
@@ -14443,15 +14187,6 @@ var require_parser = __commonJS({
           if (foundNumber = aNumber.exec(sub)) {
             i += foundNumber[0].length - 1;
             sub = part.substring(i).toString();
-            if (closingsTests) {
-              let found;
-              if (found = testMultiple(sub, closingsTests)) {
-                details.regRes = found;
-                i++;
-                done = true;
-                break;
-              }
-            }
           } else if (lastChar != char) {
             let found = null;
             if (char === ";" || insertedSemis[i + part.start] && !isStart && !lastInertedSemi) {
@@ -14475,16 +14210,6 @@ var require_parser = __commonJS({
             }
             if (!done && (foundWord = wordReg.exec(sub))) {
               isOneLiner = true;
-              if (foundWord[2]) {
-                seenKeyword = true;
-                skipNextWord = true;
-              } else if (seenKeyword) {
-                if (skipNextWord) {
-                  skipNextWord = false;
-                } else {
-                  details.bodyContentAfterKeyword = true;
-                }
-              }
               if (foundWord[0].length > 1) {
                 details.words.push(foundWord[1]);
                 details.lastAnyWord = foundWord[1];
@@ -14594,18 +14319,10 @@ var require_parser = __commonJS({
             } else {
               const extract3 = restOfExp(constants, str, [/^:/]);
               key = lispify(constants, extract3, [...next, "spreadObject"]);
-              if (utils.isLisp(key) && key[0] === 17) {
-                value = NullLisp;
-              } else {
-                if (key[0] === 1) {
-                  key = key[2];
-                }
-                if (str.length > extract3.length && str.char(extract3.length) === ":") {
-                  value = lispify(constants, str.substring(extract3.length + 1));
-                } else {
-                  value = lispify(constants, extract3, next);
-                }
+              if (key[0] === 1) {
+                key = key[2];
               }
+              value = lispify(constants, str.substring(extract3.length + 1));
             }
             return createLisp({
               op: 6,
@@ -14632,72 +14349,12 @@ var require_parser = __commonJS({
     };
     setLispType(["inverse", "not", "negative", "positive", "typeof", "delete"], (constants, type, part, res, expect, ctx) => {
       const extract2 = restOfExp(constants, part.substring(res[0].length), [/^([^\s.?\w$]|\?[^.])/]);
-      const remainingAfterOperand = part.substring(extract2.length + res[0].length);
-      const remainingStr = remainingAfterOperand.trim().toString();
-      if (remainingStr.startsWith("**")) {
-        throw new SyntaxError("Unary operator used immediately before exponentiation expression. Parenthesis must be used to disambiguate operator precedence");
-      }
       ctx.lispTree = lispify(constants, part.substring(extract2.length + res[0].length), restOfExp.next, createLisp({
         op: modifierTypes[type],
         a: ctx.lispTree,
         b: lispify(constants, extract2, expectTypes[expect].next)
       }));
     });
-    setLispType(["taggedTemplate"], (constants, type, part, res, expect, ctx) => {
-      const literalIndex = res[1];
-      const literal2 = constants.literals[parseInt(literalIndex)];
-      const [, templateStr, jsExprs] = literal2;
-      const stringParts = [];
-      const expressions = [];
-      let currentStr = "";
-      let i = 0;
-      while (i < templateStr.length) {
-        if (templateStr.substring(i, i + 2) === "${") {
-          let j = i + 2;
-          let exprIndex = "";
-          let isValidPlaceholder = false;
-          while (j < templateStr.length && templateStr[j] !== "}") {
-            exprIndex += templateStr[j];
-            j++;
-          }
-          if (j < templateStr.length && templateStr[j] === "}" && /^\d+$/.test(exprIndex)) {
-            isValidPlaceholder = true;
-          }
-          if (isValidPlaceholder) {
-            stringParts.push(currentStr);
-            currentStr = "";
-            expressions.push(jsExprs[parseInt(exprIndex)]);
-            i = j + 1;
-          } else {
-            currentStr += templateStr[i];
-            i++;
-          }
-        } else {
-          currentStr += templateStr[i];
-          i++;
-        }
-      }
-      stringParts.push(currentStr);
-      const stringsArray = stringParts.map((str) => createLisp({
-        op: 2,
-        a: 0,
-        b: String(constants.strings.push(str) - 1)
-      }));
-      const stringsArrayLisp = createLisp({
-        op: 12,
-        a: createLisp({
-          op: 0,
-          a: 0,
-          b: 0
-        }),
-        b: stringsArray
-      });
-      ctx.lispTree = lispify(constants, part.substring(res[0].length), expectTypes[expect].next, createLisp({
-        op: 5,
-        a: ctx.lispTree,
-        b: [stringsArrayLisp, ...expressions]
-      }));
-    });
     var incrementTypes = {
       "++$": 25,
       "--$": 27,
@@ -14722,7 +14379,7 @@ var require_parser = __commonJS({
     var adderTypes = {
       "&&": 29,
       "||": 30,
-      "??": 89,
+      "??": 85,
       instanceof: 62,
       in: 63,
       "=": 9,
@@ -14737,12 +14394,9 @@ var require_parser = __commonJS({
       "|=": 73,
       ">>>=": 74,
       "<<=": 76,
-      ">>=": 75,
-      "&&=": 90,
-      "||=": 91,
-      "??=": 92
+      ">>=": 75
     };
-    setLispType(["assign", "assignModify", "nullishCoalescing"], (constants, type, part, res, expect, ctx) => {
+    setLispType(["assign", "assignModify", "boolOp"], (constants, type, part, res, expect, ctx) => {
       ctx.lispTree = createLisp({
         op: adderTypes[res[0]],
         a: ctx.lispTree,
@@ -14769,46 +14423,20 @@ var require_parser = __commonJS({
       "/": 48,
       "**": 49,
       "*": 50,
-      "%": 51,
-      "&&": 29,
-      "||": 30,
-      instanceof: 62,
-      in: 63
-    };
-    setLispType([
-      "power",
-      "opHigh",
-      "op",
-      "comparitor",
-      "bitwiseShift",
-      "bitwiseAnd",
-      "bitwiseXor",
-      "bitwiseOr",
-      "boolOpAnd",
-      "boolOpOr"
-    ], (constants, type, part, res, expect, ctx) => {
+      "%": 51
+    };
+    setLispType(["opHigh", "op", "comparitor", "bitwise"], (constants, type, part, res, expect, ctx) => {
       const next = [expectTypes.inlineIf.types.inlineIf, inlineIfElse];
       switch (type) {
-        case "power":
-          break;
         case "opHigh":
           next.push(expectTypes.splitter.types.opHigh);
         case "op":
           next.push(expectTypes.splitter.types.op);
         case "comparitor":
           next.push(expectTypes.splitter.types.comparitor);
-        case "bitwiseShift":
-          next.push(expectTypes.splitter.types.bitwiseShift);
-        case "bitwiseAnd":
-          next.push(expectTypes.splitter.types.bitwiseAnd);
-        case "bitwiseXor":
-          next.push(expectTypes.splitter.types.bitwiseXor);
-        case "bitwiseOr":
-          next.push(expectTypes.splitter.types.bitwiseOr);
-        case "boolOpAnd":
-          next.push(expectTypes.splitter.types.boolOpAnd);
-        case "boolOpOr":
-          next.push(expectTypes.splitter.types.boolOpOr);
+        case "bitwise":
+          next.push(expectTypes.splitter.types.bitwise);
+          next.push(expectTypes.splitter.types.boolOp);
       }
       const extract2 = restOfExp(constants, part.substring(res[0].length), next);
       ctx.lispTree = lispify(constants, part.substring(extract2.length + res[0].length), restOfExp.next, createLisp({
@@ -14982,11 +14610,7 @@ var require_parser = __commonJS({
           prop = matches[0];
           index = prop.length + res[0].length;
         } else {
-          throw new SyntaxError("Hanging dot");
-        }
-      } else {
-        if (utils.reservedWords.has(prop) && prop !== "this") {
-          throw new SyntaxError(`Unexpected token '${prop}'`);
+          throw new SyntaxError("Hanging  dot");
         }
       }
       ctx.lispTree = lispify(constants, part.substring(index), expectTypes[expect].next, createLisp({
@@ -15011,14 +14635,14 @@ var require_parser = __commonJS({
     });
     setLispType(["number", "boolean", "null", "und", "NaN", "Infinity"], (constants, type, part, res, expect, ctx) => {
       ctx.lispTree = lispify(constants, part.substring(res[0].length), expectTypes[expect].next, createLisp({
-        op: type === "number" ? res[12] ? 83 : 7 : 35,
+        op: type === "number" ? res[10] ? 83 : 7 : 35,
         a: 0,
-        b: res[12] ? res[1] : res[0]
+        b: res[10] ? res[1] : res[0]
       }));
     });
     setLispType(["string", "literal", "regex"], (constants, type, part, res, expect, ctx) => {
       ctx.lispTree = lispify(constants, part.substring(res[0].length), expectTypes[expect].next, createLisp({
-        op: type === "string" ? 2 : type === "literal" ? 84 : 85,
+        op: type === "string" ? 2 : type === "literal" ? 84 : 86,
         a: 0,
         b: res[1]
       }));
@@ -15043,7 +14667,7 @@ var require_parser = __commonJS({
       const isArrow = type !== "function" && type !== "inlineFunction";
       const isReturn = isArrow && !res[res.length - 1];
       const argPos = isArrow ? 2 : 3;
-      const isAsync2 = res[1] ? 88 : 0;
+      const isAsync2 = res[1] ? 89 : 0;
       const args = res[argPos] ? res[argPos].replace(/\s+/g, "").split(/,/g) : [];
       if (!isArrow) {
         args.unshift((res[2] || "").trimStart());
@@ -15057,11 +14681,6 @@ var require_parser = __commonJS({
       });
       const f = restOfExp(constants, part.substring(res[0].length), !isReturn ? [/^}/] : [/^[,)}\]]/, semiColon]);
       const func = isReturn ? "return " + f : f.toString();
-      args.forEach((arg) => {
-        if (utils.reservedWords.has(arg.replace(/^\.\.\./, ""))) {
-          throw new SyntaxError(`Unexpected token '${arg}'`);
-        }
-      });
       ctx.lispTree = lispify(constants, part.substring(res[0].length + func.length + 1), expectTypes[expect].next, createLisp({
         op: isArrow ? 11 : type === "function" ? 37 : 10,
         a: [isAsync2, ...args],
@@ -15071,13 +14690,13 @@ var require_parser = __commonJS({
     var iteratorRegex = /^((let|var|const)\s+)?\s*([a-zA-Z$_][a-zA-Z\d$_]*)\s+(in|of)(?![\w$])/;
     setLispType(["for", "do", "while"], (constants, type, part, res, expect, ctx) => {
       let i = 0;
-      let startStep = 88;
+      let startStep = 89;
       let startInternal = [];
       let getIterator = 0;
       let beforeStep = 0;
-      let checkFirst = 88;
+      let checkFirst = 89;
       let condition;
-      let step = 88;
+      let step = 89;
       let body;
       switch (type) {
         case "while": {
@@ -15157,7 +14776,7 @@ var require_parser = __commonJS({
     });
     setLispType(["loopAction"], (constants, type, part, res, expect, ctx) => {
       ctx.lispTree = createLisp({
-        op: 86,
+        op: 87,
         a: res[1],
         b: 0
       });
@@ -15172,7 +14791,7 @@ var require_parser = __commonJS({
       let offset2 = 0;
       if (catchRes[1].startsWith("catch")) {
         catchRes = catchReg.exec(part.substring(res[0].length + body.length + 1).toString());
-        exception = catchRes[3] || "";
+        exception = catchRes[2];
         catchBody = restOfExp(constants, part.substring(res[0].length + body.length + 1 + catchRes[0].length), [], "{");
         offset2 = res[0].length + body.length + 1 + catchRes[0].length + catchBody.length + 1;
         if ((catchRes = catchReg.exec(part.substring(offset2).toString())) && catchRes[1].startsWith("finally")) {
@@ -15195,7 +14814,7 @@ var require_parser = __commonJS({
     setLispType(["void", "await"], (constants, type, part, res, expect, ctx) => {
       const extract2 = restOfExp(constants, part.substring(res[0].length), [/^([^\s.?\w$]|\?[^.])/]);
       ctx.lispTree = lispify(constants, part.substring(res[0].length + extract2.length), expectTypes[expect].next, createLisp({
-        op: type === "void" ? 87 : 44,
+        op: type === "void" ? 88 : 44,
         a: lispify(constants, extract2),
         b: 0
       }));
@@ -15412,7 +15031,6 @@ var require_parser = __commonJS({
       let rest = str;
       let sub = emptyString;
       let details = {};
-      let pendingDoWhile = false;
       const inserted = insertedSemicolons.get(str.ref) || new Array(str.ref.str.length);
       while ((sub = restOfExp(constants, rest, [], void 0, void 0, [colonsRegex], details)).length) {
         let valid = false;
@@ -15427,12 +15045,7 @@ var require_parser = __commonJS({
             const res = closingsNoInsertion.exec(rest.substring(sub.length - 1).toString());
             if (res) {
               if (res[2] === "while") {
-                if (details.lastWord === "do") {
-                  valid = false;
-                  pendingDoWhile = true;
-                } else {
-                  valid = true;
-                }
+                valid = details.lastWord !== "do";
               } else {
                 valid = false;
               }
@@ -15440,11 +15053,8 @@ var require_parser = __commonJS({
               valid = false;
             }
           } else if (a) {
-            if (pendingDoWhile && details.lastWord === "while") {
-              valid = true;
-              pendingDoWhile = false;
-            } else if (details.lastWord === "if" || details.lastWord === "while" || details.lastWord === "for" || details.lastWord === "else") {
-              valid = !!details.bodyContentAfterKeyword;
+            if (details.lastWord === "if" || details.lastWord === "while" || details.lastWord === "for" || details.lastWord === "else") {
+              valid = false;
             }
           }
         }
@@ -15506,7 +15116,6 @@ var require_parser = __commonJS({
               i++;
             } else if (comment === "\n") {
               comment = "";
-              strRes.push("\n");
             }
           }
         } else {
@@ -15615,6 +15224,8 @@ var require_SandboxExec = __commonJS({
     var executor = require_executor();
     var utils = require_utils();
     function subscribeSet(obj, name, callback, context) {
+      if (!(obj instanceof Object))
+        throw new Error("Invalid subscription object, got " + (typeof obj === "object" ? "null" : typeof obj));
       const names = context.setSubscriptions.get(obj) || /* @__PURE__ */ new Map();
       context.setSubscriptions.set(obj, names);
       const callbacks = names.get(name) || /* @__PURE__ */ new Set();
@@ -15640,12 +15251,6 @@ var require_SandboxExec = __commonJS({
         this.setSubscriptions = /* @__PURE__ */ new WeakMap();
         this.changeSubscriptions = /* @__PURE__ */ new WeakMap();
         this.sandboxFunctions = /* @__PURE__ */ new WeakMap();
-        this.haltSubscriptions = /* @__PURE__ */ new Set();
-        this.resumeSubscriptions = /* @__PURE__ */ new Set();
-        this.halted = false;
-        this.timeoutHandleCounter = 0;
-        this.setTimeoutHandles = /* @__PURE__ */ new Map();
-        this.setIntervalHandles = /* @__PURE__ */ new Map();
         const opt = Object.assign({
           audit: false,
           forbidFunctionCalls: false,
@@ -15658,9 +15263,7 @@ var require_SandboxExec = __commonJS({
       }
       static get SAFE_GLOBALS() {
         return {
-          globalThis,
           Function,
-          eval,
           console: {
             debug: console.debug,
             error: console.error,
@@ -15748,8 +15351,6 @@ var require_SandboxExec = __commonJS({
           map2.set(proto, /* @__PURE__ */ new Set());
         });
         map2.set(Object, /* @__PURE__ */ new Set([
-          "constructor",
-          "name",
           "entries",
           "fromEntries",
           "getOwnPropertyNames",
@@ -15775,56 +15376,20 @@ var require_SandboxExec = __commonJS({
       subscribeSetGlobal(obj, name, callback) {
         return subscribeSet(obj, name, callback, this);
       }
-      subscribeHalt(cb) {
-        this.haltSubscriptions.add(cb);
-        return {
-          unsubscribe: () => {
-            this.haltSubscriptions.delete(cb);
-          }
-        };
-      }
-      subscribeResume(cb) {
-        this.resumeSubscriptions.add(cb);
-        return {
-          unsubscribe: () => {
-            this.resumeSubscriptions.delete(cb);
-          }
-        };
-      }
-      haltExecution(haltContext) {
-        if (this.halted)
-          return;
-        this.halted = true;
-        for (const cb of this.haltSubscriptions) {
-          cb(haltContext);
-        }
-      }
-      resumeExecution() {
-        if (!this.halted)
-          return;
-        if (this.context.ticks.tickLimit && this.context.ticks.ticks >= this.context.ticks.tickLimit) {
-          throw new utils.SandboxExecutionQuotaExceededError("Cannot resume execution: tick limit exceeded");
-        }
-        this.halted = false;
-        for (const cb of this.resumeSubscriptions) {
-          cb();
-        }
-      }
       getContext(fn) {
         return this.sandboxFunctions.get(fn);
       }
       executeTree(context, scopes = []) {
-        return executor.executeTree(context.ctx.ticks, context, context.tree, scopes);
+        return executor.executeTree({
+          ticks: BigInt(0)
+        }, context, context.tree, scopes);
       }
       executeTreeAsync(context, scopes = []) {
-        return executor.executeTreeAsync(context.ctx.ticks, context, context.tree, scopes);
+        return executor.executeTreeAsync({
+          ticks: BigInt(0)
+        }, context, context.tree, scopes);
       }
     };
-    exports2.LocalScope = utils.LocalScope;
-    exports2.SandboxAccessError = utils.SandboxAccessError;
-    exports2.SandboxCapabilityError = utils.SandboxCapabilityError;
-    exports2.SandboxError = utils.SandboxError;
-    exports2.SandboxExecutionTreeError = utils.SandboxExecutionTreeError;
     exports2.default = SandboxExec;
   }
 });
@@ -15845,15 +15410,10 @@ var require_Sandbox = __commonJS({
         sandboxedEval,
         sandboxedSetTimeout,
         sandboxedSetInterval,
-        sandboxedClearTimeout,
-        sandboxedClearInterval,
         lispifyFunction: parser.lispifyFunction
       };
     }
-    function SB() {
-    }
     function sandboxFunction(context, ticks) {
-      SandboxFunction.prototype = SB.prototype;
       return SandboxFunction;
       function SandboxFunction(...params) {
         const code = params.pop() || "";
@@ -15865,10 +15425,7 @@ var require_Sandbox = __commonJS({
         }, void 0, "anonymous");
       }
     }
-    function SAF() {
-    }
     function sandboxAsyncFunction(context, ticks) {
-      SandboxAsyncFunction.prototype = SAF.prototype;
       return SandboxAsyncFunction;
       function SandboxAsyncFunction(...params) {
         const code = params.pop() || "";
@@ -15880,172 +15437,25 @@ var require_Sandbox = __commonJS({
         }, void 0, "anonymous");
       }
     }
-    function SE() {
-    }
-    function sandboxedEval(func, context) {
-      sandboxEval.prototype = SE.prototype;
+    function sandboxedEval(func) {
       return sandboxEval;
       function sandboxEval(code) {
-        const parsed = parser.default(code);
-        const tree = wrapLastStatementInReturn(parsed.tree);
-        return executor.createFunction([], tree, executor.currentTicks.current, {
-          ...context,
-          constants: parsed.constants,
-          tree
-        }, void 0, "anonymous")();
-      }
-    }
-    function wrapLastStatementInReturn(tree) {
-      if (tree.length === 0)
-        return tree;
-      const newTree = [...tree];
-      const lastIndex = newTree.length - 1;
-      const lastStmt = newTree[lastIndex];
-      if (Array.isArray(lastStmt) && lastStmt.length >= 1) {
-        const op = lastStmt[0];
-        if (op === 8 || op === 46) {
-          return newTree;
-        }
-        const statementTypes = [
-          3,
-          // 3
-          4,
-          // 4
-          34,
-          // 35
-          37,
-          // 38
-          13,
-          // 14
-          38,
-          // 39
-          39,
-          // 40
-          40,
-          // 41
-          42,
-          // 43
-          43
-          // 44
-        ];
-        if (statementTypes.includes(op)) {
-          return newTree;
-        }
-        newTree[lastIndex] = [8, 0, lastStmt];
-      }
-      return newTree;
-    }
-    function sST() {
-    }
-    function sandboxedSetTimeout(func, context) {
-      sandboxSetTimeout.prototype = sST.prototype;
-      return sandboxSetTimeout;
-      function sandboxSetTimeout(handler, timeout, ...args) {
-        const sandbox = context.ctx.sandbox;
-        const exec6 = (...a) => {
-          const h = typeof handler === "string" ? func(handler) : handler;
-          haltsub.unsubscribe();
-          contsub.unsubscribe();
-          sandbox.setTimeoutHandles.delete(sandBoxhandle);
-          return h(...a);
-        };
-        const sandBoxhandle = ++sandbox.timeoutHandleCounter;
-        let start = Date.now();
-        let handle = setTimeout(exec6, timeout, ...args);
-        let elapsed = 0;
-        const haltsub = sandbox.subscribeHalt(() => {
-          elapsed = Date.now() - start + elapsed;
-          clearTimeout(handle);
-        });
-        const contsub = sandbox.subscribeResume(() => {
-          start = Date.now();
-          const remaining = Math.floor((timeout || 0) - elapsed);
-          handle = setTimeout(exec6, remaining, ...args);
-          sandbox.setTimeoutHandles.set(sandBoxhandle, {
-            handle,
-            haltsub,
-            contsub
-          });
-        });
-        sandbox.setTimeoutHandles.set(sandBoxhandle, {
-          handle,
-          haltsub,
-          contsub
-        });
-        return sandBoxhandle;
+        return func(code)();
       }
     }
-    function sCT() {
-    }
-    function sandboxedClearTimeout(context) {
-      sandboxClearTimeout.prototype = sCT.prototype;
-      return sandboxClearTimeout;
-      function sandboxClearTimeout(handle) {
-        const sandbox = context.ctx.sandbox;
-        const timeoutHandle = sandbox.setTimeoutHandles.get(handle);
-        if (timeoutHandle) {
-          clearTimeout(timeoutHandle.handle);
-          timeoutHandle.haltsub.unsubscribe();
-          timeoutHandle.contsub.unsubscribe();
-          sandbox.setTimeoutHandles.delete(handle);
-        }
-      }
-    }
-    function sCI() {
-    }
-    function sandboxedClearInterval(context) {
-      sandboxClearInterval.prototype = sCI.prototype;
-      return sandboxClearInterval;
-      function sandboxClearInterval(handle) {
-        const sandbox = context.ctx.sandbox;
-        const intervalHandle = sandbox.setIntervalHandles.get(handle);
-        if (intervalHandle) {
-          clearInterval(intervalHandle.handle);
-          intervalHandle.haltsub.unsubscribe();
-          intervalHandle.contsub.unsubscribe();
-          sandbox.setIntervalHandles.delete(handle);
-        }
-      }
-    }
-    function sSI() {
+    function sandboxedSetTimeout(func) {
+      return function sandboxSetTimeout(handler, ...args) {
+        if (typeof handler !== "string")
+          return setTimeout(handler, ...args);
+        return setTimeout(func(handler), ...args);
+      };
     }
-    function sandboxedSetInterval(func, context) {
-      sandboxSetInterval.prototype = sSI.prototype;
-      return sandboxSetInterval;
-      function sandboxSetInterval(handler, timeout, ...args) {
-        const sandbox = context.ctx.sandbox;
-        const h = typeof handler === "string" ? func(handler) : handler;
-        const exec6 = (...a) => {
-          start = Date.now();
-          elapsed = 0;
-          return h(...a);
-        };
-        const sandBoxhandle = ++sandbox.timeoutHandleCounter;
-        let start = Date.now();
-        let handle = setInterval(exec6, timeout, ...args);
-        let elapsed = 0;
-        const haltsub = sandbox.subscribeHalt(() => {
-          elapsed = Date.now() - start + elapsed;
-          clearInterval(handle);
-        });
-        const contsub = sandbox.subscribeResume(() => {
-          start = Date.now();
-          handle = setTimeout(() => {
-            start = Date.now();
-            elapsed = 0;
-            handle = setInterval(exec6, timeout, ...args);
-            exec6(...args);
-          }, Math.floor((timeout || 0) - elapsed), ...args);
-          handlObj.handle = handle;
-        });
-        const handlObj = {
-          handle,
-          haltsub,
-          contsub
-        };
-        sandbox.setIntervalHandles.set(sandBoxhandle, handlObj);
-        return sandBoxhandle;
-      }
+    function sandboxedSetInterval(func) {
+      return function sandboxSetInterval(handler, ...args) {
+        if (typeof handler !== "string")
+          return setInterval(handler, ...args);
+        return setInterval(func(handler), ...args);
+      };
     }
     var Sandbox2 = class extends SandboxExec.default {
       constructor(options) {
@@ -16104,11 +15514,6 @@ var require_Sandbox = __commonJS({
         return exec6;
       }
     };
-    exports2.LocalScope = utils.LocalScope;
-    exports2.SandboxAccessError = utils.SandboxAccessError;
-    exports2.SandboxCapabilityError = utils.SandboxCapabilityError;
-    exports2.SandboxError = utils.SandboxError;
-    exports2.SandboxExecutionTreeError = utils.SandboxExecutionTreeError;
     exports2.default = Sandbox2;
   }
 });
@@ -68643,9 +68048,11 @@ __export(schemaUtils_exports, {
   isJsonSchema: () => isJsonSchema,
   isJsonSchemaDefinition: () => isJsonSchemaDefinition,
   isMermaidSchema: () => isMermaidSchema,
+  isSimpleTextWrapperSchema: () => isSimpleTextWrapperSchema,
   processSchemaResponse: () => processSchemaResponse,
   replaceMermaidDiagramsInJson: () => replaceMermaidDiagramsInJson,
   replaceMermaidDiagramsInMarkdown: () => replaceMermaidDiagramsInMarkdown,
+  tryAutoWrapForSimpleSchema: () => tryAutoWrapForSimpleSchema,
   tryMaidAutoFix: () => tryMaidAutoFix,
   validateAndFixMermaidResponse: () => validateAndFixMermaidResponse,
   validateJsonResponse: () => validateJsonResponse,
@@ -69163,6 +68570,46 @@ function isJsonSchemaDefinition(jsonString, options = {}) {
     return false;
   }
 }
+function isSimpleTextWrapperSchema(schema) {
+  if (!schema || typeof schema !== "string") {
+    return null;
+  }
+  const trimmed = schema.trim();
+  const simplePatterns = [
+    /^\{\s*["']?(\w+)["']?\s*:\s*["']?string["']?\s*\}$/i,
+    /^\{\s*["']?type["']?\s*:\s*["']?object["']?\s*,\s*["']?properties["']?\s*:\s*\{\s*["']?(\w+)["']?\s*:\s*\{\s*["']?type["']?\s*:\s*["']?string["']?\s*\}\s*\}\s*\}$/i
+  ];
+  for (const pattern of simplePatterns) {
+    const match2 = trimmed.match(pattern);
+    if (match2) {
+      return { fieldName: match2[1] };
+    }
+  }
+  return null;
+}
+function tryAutoWrapForSimpleSchema(response, schema, options = {}) {
+  const { debug = false } = options;
+  const wrapperInfo = isSimpleTextWrapperSchema(schema);
+  if (!wrapperInfo) {
+    if (debug) {
+      console.log(`[DEBUG] Auto-wrap: Schema is not a simple text wrapper`);
+    }
+    return null;
+  }
+  try {
+    JSON.parse(response);
+    if (debug) {
+      console.log(`[DEBUG] Auto-wrap: Response is already valid JSON, skipping`);
+    }
+    return null;
+  } catch {
+  }
+  const wrapped = JSON.stringify({ [wrapperInfo.fieldName]: response });
+  if (debug) {
+    console.log(`[DEBUG] Auto-wrap: Wrapped plain text in {"${wrapperInfo.fieldName}": ...} (${response.length} chars)`);
+  }
+  return wrapped;
+}
 function createJsonCorrectionPrompt(invalidResponse, schema, errorOrValidation, retryCount = 0) {
   let errorMessage;
   let enhancedError;
@@ -69194,7 +68641,7 @@ function createJsonCorrectionPrompt(invalidResponse, schema, errorOrValidation,
   const currentLevel = strengthLevels[level];
   let prompt = `${currentLevel.prefix} Your previous response is not valid JSON and cannot be parsed. Here's what you returned:
 
-${invalidResponse.substring(0, 500)}${invalidResponse.length > 500 ? "..." : ""}
+${invalidResponse}
 
 Error: ${enhancedError}
 
@@ -84232,6 +83679,14 @@ ${errorXml}
                     });
                     const executeToolCall = async () => {
                       if (toolName === "delegate") {
+                        let allowedToolsForDelegate = null;
+                        if (this.allowedTools.mode === "whitelist") {
+                          allowedToolsForDelegate = [...this.allowedTools.allowed];
+                        } else if (this.allowedTools.mode === "none") {
+                          allowedToolsForDelegate = [];
+                        } else if (this.allowedTools.mode === "all" && this.allowedTools.exclusions?.length > 0) {
+                          allowedToolsForDelegate = ["*", ...this.allowedTools.exclusions.map((t) => "!" + t)];
+                        }
                         const enhancedParams = {
                           ...toolParams,
                           currentIteration,
@@ -84247,6 +83702,18 @@ ${errorXml}
                           searchDelegate: this.searchDelegate,
                           enableTasks: this.enableTasks,
                           // Inherit task management (subagent gets isolated TaskManager)
+                          enableMcp: !!this.mcpBridge,
+                          // Inherit MCP enablement
+                          mcpConfig: this.mcpConfig,
+                          // Inherit MCP configuration
+                          mcpConfigPath: this.mcpConfigPath,
+                          // Inherit MCP config path
+                          enableBash: this.enableBash,
+                          // Inherit bash enablement
+                          bashConfig: this.bashConfig,
+                          // Inherit bash configuration
+                          allowedTools: allowedToolsForDelegate,
+                          // Inherit allowed tools from parent
                           debug: this.debug,
                           tracer: this.tracer
                         };
@@ -84865,6 +84332,16 @@ Convert your previous response content into actual JSON data that follows this s
                   validation = validateJsonResponse(finalResult);
                   retryCount = 1;
                 }
+                if (!validation.isValid) {
+                  const autoWrapped = tryAutoWrapForSimpleSchema(finalResult, options.schema, { debug: this.debug });
+                  if (autoWrapped) {
+                    if (this.debug) {
+                      console.log(`[DEBUG] JSON validation: Auto-wrapped plain text for simple schema`);
+                    }
+                    finalResult = autoWrapped;
+                    validation = validateJsonResponse(finalResult, { debug: this.debug });
+                  }
+                }
                 while (!validation.isValid && retryCount < maxRetries) {
                   if (this.debug) {
                     console.log(`[DEBUG] JSON validation: attempt_completion validation failed (attempt ${retryCount + 1}/${maxRetries}):`, validation.error);