cvm-server 0.16.0-next.1 → 0.16.0-next.3

package/main.cjs

@@ -43,7 +43,7 @@ function n(T2) {
 function t(T2) {
   return T2 === null;
 }
-function S$1(T2) {
+function S(T2) {
   return T2 !== null && typeof T2 == "object" && "type" in T2 && T2.type === "array";
 }
 function I$1(T2) {
@@ -59,15 +59,15 @@ function c(T2) {
   return T2 !== null && typeof T2 == "object" && "type" in T2 && T2.type === "object-ref";
 }
 function u(T2) {
-  return _$1(T2) ? T2 : E$2(T2) || n(T2) ? T2.toString() : t(T2) ? "null" : I$1(T2) ? "undefined" : S$1(T2) ? `[array:${T2.elements.length}]` : i(T2) ? "[object Object]" : String(T2);
+  return _$1(T2) ? T2 : E$2(T2) || n(T2) ? T2.toString() : t(T2) ? "null" : I$1(T2) ? "undefined" : S(T2) ? `[array:${T2.elements.length}]` : i(T2) ? "[object Object]" : String(T2);
 }
 function M$2(T2) {
-  return n(T2) ? T2 : t(T2) || I$1(T2) ? false : E$2(T2) ? T2 !== 0 : _$1(T2) ? T2 !== "" : S$1(T2) || i(T2) ? true : !!T2;
+  return n(T2) ? T2 : t(T2) || I$1(T2) ? false : E$2(T2) ? T2 !== 0 : _$1(T2) ? T2 !== "" : S(T2) || i(T2) ? true : !!T2;
 }
 function y$1(T2) {
-  return _$1(T2) ? "string" : E$2(T2) ? "number" : n(T2) ? "boolean" : t(T2) ? "null" : I$1(T2) ? "undefined" : S$1(T2) || L$1(T2) ? "array" : i(T2) || c(T2) ? "object" : "unknown";
+  return _$1(T2) ? "string" : E$2(T2) ? "number" : n(T2) ? "boolean" : t(T2) ? "null" : I$1(T2) ? "undefined" : S(T2) || L$1(T2) ? "array" : i(T2) || c(T2) ? "object" : "unknown";
 }
-function F$1(T2) {
+function F$2(T2) {
   if (E$2(T2)) return T2;
   if (n(T2)) return T2 ? 1 : 0;
   if (t(T2)) return 0;
@@ -76,9 +76,9 @@ function F$1(T2) {
     const R2 = T2.trim();
     return R2 === "" ? 0 : Number(R2);
   }
-  return S$1(T2) ? NaN : Number(T2);
+  return S(T2) ? NaN : Number(T2);
 }
-function Y$1(T2 = [], R2) {
+function Y$2(T2 = [], R2) {
   return R2 ? { type: "array", elements: T2, properties: R2 } : { type: "array", elements: T2 };
 }
 function s() {
@@ -87,14 +87,14 @@ function s() {
 function b$2(T2 = {}) {
   return { type: "object", properties: T2 };
 }
-const f$2 = require("pino"), G$2 = require("fs"), D$2 = require("path");
+const f$2 = require("pino"), G$2 = require("fs"), D$1 = require("path");
 let r = null;
-function U$1() {
+function U$2() {
   if (!r) {
     const T2 = process.env.CVM_LOG_LEVEL || "info", R2 = process.env.CVM_LOG_FILE || ".cvm/cvm-debug.log";
     let N2;
     try {
-      const A2 = D$2.dirname(R2);
+      const A2 = D$1.dirname(R2);
       G$2.existsSync(A2) || G$2.mkdirSync(A2, { recursive: true }), N2 = f$2.destination(R2);
     } catch {
       N2 = process.stdout;
@@ -107,11 +107,11 @@ function U$1() {
 }
 const g = new Proxy({}, {
   get(T2, R2) {
-    return U$1()[R2];
+    return U$2()[R2];
   }
 });
-var d$3 = Object.defineProperty;
-var y = (t2, e, i2) => e in t2 ? d$3(t2, e, { enumerable: true, configurable: true, writable: true, value: i2 }) : t2[e] = i2;
+var d$2 = Object.defineProperty;
+var y = (t2, e, i2) => e in t2 ? d$2(t2, e, { enumerable: true, configurable: true, writable: true, value: i2 }) : t2[e] = i2;
 var h$1 = (t2, e, i2) => y(t2, typeof e != "symbol" ? e + "" : e, i2);
 function P(t2) {
   const e = [], i2 = [];
@@ -238,7 +238,7 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
     const l = e.currentAddress();
     e.patchJumps(m.endTargets, l);
   }
-}, A$1 = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
+}, A$2 = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
   const a2 = e.currentAddress();
   i2(t2.expression);
   const m = {
@@ -345,7 +345,7 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
     const g2 = e.currentAddress();
     e.patchJumps(p2.breakTargets || [], g2), e.patchJumps(p2.continueTargets || [], l);
   }
-}, U = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
+}, U$1 = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
   const a2 = e.generateTempVar();
   i2(t2.expression), e.emit(P$1.STORE, a2);
   const c2 = [], m = [];
@@ -444,7 +444,7 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
     s2.breakTargets = s2.breakTargets || [], s2.breakTargets.push(a2);
   } else
     i2.reportError(t2, "break statement not in loop");
-}, F = (t2, e, i2) => {
+}, F$1 = (t2, e, i2) => {
   const s2 = e.findLoopContext();
   if (s2 && s2.startAddress !== void 0) {
     const a2 = e.emit(P$1.CONTINUE, -1);
@@ -453,22 +453,22 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
     i2.reportError(t2, "continue statement not in loop");
 }, L = {
   [r__namespace.SyntaxKind.IfStatement]: k,
-  [r__namespace.SyntaxKind.WhileStatement]: A$1,
+  [r__namespace.SyntaxKind.WhileStatement]: A$2,
   [r__namespace.SyntaxKind.ForOfStatement]: I,
   [r__namespace.SyntaxKind.ForInStatement]: R,
   [r__namespace.SyntaxKind.ForStatement]: C$1,
-  [r__namespace.SyntaxKind.SwitchStatement]: U,
+  [r__namespace.SyntaxKind.SwitchStatement]: U$1,
   [r__namespace.SyntaxKind.Block]: _,
   [r__namespace.SyntaxKind.VariableStatement]: b$1,
   [r__namespace.SyntaxKind.ExpressionStatement]: N,
   [r__namespace.SyntaxKind.ReturnStatement]: O,
   [r__namespace.SyntaxKind.BreakStatement]: K,
-  [r__namespace.SyntaxKind.ContinueStatement]: F
+  [r__namespace.SyntaxKind.ContinueStatement]: F$1
 }, J$1 = (t2, e, i2) => {
   e.emit(P$1.PUSH, t2.text);
 }, H = (t2, e, i2) => {
   e.emit(P$1.PUSH, Number(t2.text));
-}, D$1 = (t2, e, i2) => {
+}, D = (t2, e, i2) => {
   e.emit(P$1.PUSH, true);
 }, M$1 = (t2, e, i2) => {
   e.emit(P$1.PUSH, false);
@@ -479,15 +479,15 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
   e.emit(P$1.LOAD_REGEX, { pattern: c2, flags: m });
 }, q$1 = (t2, e, i2) => {
   t2.text === "undefined" ? e.emit(P$1.PUSH_UNDEFINED) : e.emit(P$1.LOAD, t2.text);
-}, B$1 = (t2, e, { compileExpression: i2 }) => {
+}, B = (t2, e, { compileExpression: i2 }) => {
   e.emit(P$1.ARRAY_NEW), t2.elements.forEach((s2) => {
     i2(s2), e.emit(P$1.ARRAY_PUSH);
   });
 }, V = (t2, e, { compileExpression: i2 }) => {
   i2(t2.expression);
-}, $$1 = (t2, e, { compileExpression: i2 }) => {
+}, $$2 = (t2, e, { compileExpression: i2 }) => {
   t2.name.text === "length" ? (i2(t2.expression), e.emit(P$1.LENGTH)) : (i2(t2.expression), e.emit(P$1.PUSH, t2.name.text), e.emit(P$1.PROPERTY_GET));
-}, j = (t2, e, { compileExpression: i2, reportError: s2 }) => {
+}, j$1 = (t2, e, { compileExpression: i2, reportError: s2 }) => {
   i2(t2.expression), t2.argumentExpression ? i2(t2.argumentExpression) : s2(t2, "Element access requires an index expression"), e.emit(P$1.ARRAY_GET);
 }, v$1 = (t2, e, { compileExpression: i2 }) => {
   switch (t2.operator) {
@@ -507,7 +507,7 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
       r__namespace.isIdentifier(t2.operand) && (e.emit(P$1.PUSH, t2.operand.text), e.emit(P$1.DEC, false));
       break;
   }
-}, Y = (t2, e, { compileExpression: i2 }) => {
+}, Y$1 = (t2, e, { compileExpression: i2 }) => {
   switch (t2.operator) {
     case r__namespace.SyntaxKind.PlusPlusToken:
       r__namespace.isIdentifier(t2.operand) && (e.emit(P$1.PUSH, t2.operand.text), e.emit(P$1.INC, true));
@@ -575,7 +575,7 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
   e.patchJump(a2, m);
 }, W$1 = (t2, e, { compileExpression: i2 }) => {
   i2(t2.expression), e.emit(P$1.TYPEOF);
-}, Q$1 = (t2, e, { compileExpression: i2, reportError: s2 }) => {
+}, Q = (t2, e, { compileExpression: i2, reportError: s2 }) => {
   if (r__namespace.isPropertyAccessExpression(t2.expression) && r__namespace.isIdentifier(t2.expression.expression) && t2.expression.expression.text === "fs") {
     const a2 = t2.expression.name.text;
     if (a2 === "listFiles")
@@ -682,18 +682,18 @@ const k = (t2, e, { compileExpression: i2, compileStatement: s2 }) => {
 }, ee$1 = {
   [r__namespace.SyntaxKind.StringLiteral]: J$1,
   [r__namespace.SyntaxKind.NumericLiteral]: H,
-  [r__namespace.SyntaxKind.TrueKeyword]: D$1,
+  [r__namespace.SyntaxKind.TrueKeyword]: D,
   [r__namespace.SyntaxKind.FalseKeyword]: M$1,
   [r__namespace.SyntaxKind.NullKeyword]: G$1,
   [r__namespace.SyntaxKind.RegularExpressionLiteral]: w,
   [r__namespace.SyntaxKind.Identifier]: q$1,
-  [r__namespace.SyntaxKind.ArrayLiteralExpression]: B$1,
+  [r__namespace.SyntaxKind.ArrayLiteralExpression]: B,
   [r__namespace.SyntaxKind.BinaryExpression]: z,
   [r__namespace.SyntaxKind.PrefixUnaryExpression]: v$1,
-  [r__namespace.SyntaxKind.PostfixUnaryExpression]: Y,
-  [r__namespace.SyntaxKind.CallExpression]: Q$1,
-  [r__namespace.SyntaxKind.PropertyAccessExpression]: $$1,
-  [r__namespace.SyntaxKind.ElementAccessExpression]: j,
+  [r__namespace.SyntaxKind.PostfixUnaryExpression]: Y$1,
+  [r__namespace.SyntaxKind.CallExpression]: Q,
+  [r__namespace.SyntaxKind.PropertyAccessExpression]: $$2,
+  [r__namespace.SyntaxKind.ElementAccessExpression]: j$1,
   [r__namespace.SyntaxKind.ConditionalExpression]: X$1,
   [r__namespace.SyntaxKind.TypeOfExpression]: W$1,
   [r__namespace.SyntaxKind.ParenthesizedExpression]: V,
@@ -778,8 +778,8 @@ function ie$1(t2) {
     errors: e
   };
 }
-var d$2 = Object.defineProperty;
-var h = (s2, t2, n2) => t2 in s2 ? d$2(s2, t2, { enumerable: true, configurable: true, writable: true, value: n2 }) : s2[t2] = n2;
+var d$1 = Object.defineProperty;
+var h = (s2, t2, n2) => t2 in s2 ? d$1(s2, t2, { enumerable: true, configurable: true, writable: true, value: n2 }) : s2[t2] = n2;
 var a = (s2, t2, n2) => h(s2, typeof t2 != "symbol" ? t2 + "" : t2, n2);
 class p {
   constructor(t2) {
@@ -1042,7 +1042,7 @@ var b = (e, t2, r2) => X(e, typeof t2 != "symbol" ? t2 + "" : t2, r2);
 function Z(e) {
   return !!(e && typeof e == "object" && "type" in e && "message" in e);
 }
-function d$1(e, t2) {
+function d(e, t2) {
   return e.stack.length < 1 ? {
     type: "RuntimeError",
     message: "Stack underflow",
@@ -1055,14 +1055,14 @@ const f2 = Z, ee = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
       if (_$1(o) || _$1(r2))
         e.stack.push(u(o) + u(r2));
       else {
-        const c2 = F$1(o), s2 = F$1(r2);
+        const c2 = F$2(o), s2 = F$2(r2);
         e.stack.push(c2 + s2);
       }
     }
@@ -1071,11 +1071,11 @@ const f2 = Z, ee = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
-      const c2 = F$1(o), s2 = F$1(r2);
+      const c2 = F$2(o), s2 = F$2(r2);
       e.stack.push(c2 - s2);
     }
   },
@@ -1083,11 +1083,11 @@ const f2 = Z, ee = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
-      const c2 = F$1(o), s2 = F$1(r2);
+      const c2 = F$2(o), s2 = F$2(r2);
       e.stack.push(c2 * s2);
     }
   },
@@ -1095,11 +1095,11 @@ const f2 = Z, ee = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
-      const c2 = F$1(o), s2 = F$1(r2);
+      const c2 = F$2(o), s2 = F$2(r2);
       if (s2 === 0)
         return {
           type: "DivisionByZero",
@@ -1114,11 +1114,11 @@ const f2 = Z, ee = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
-      const c2 = F$1(o), s2 = F$1(r2);
+      const c2 = F$2(o), s2 = F$2(r2);
       e.stack.push(c2 % s2);
     }
   },
@@ -1126,9 +1126,9 @@ const f2 = Z, ee = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = F$1(r2);
+      const o = F$2(r2);
       e.stack.push(-o);
     }
   },
@@ -1136,9 +1136,9 @@ const f2 = Z, ee = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = F$1(r2);
+      const o = F$2(r2);
       e.stack.push(o);
     }
   }
@@ -1363,7 +1363,7 @@ const f2 = Z, ee = {
             opcode: t2.op
           };
         o = c2.data;
-      } else if (S$1(r2))
+      } else if (S(r2))
         o = r2;
       else
         return {
@@ -1418,9 +1418,9 @@ const f2 = Z, ee = {
   }
 };
 function v(e, t2, r2) {
-  const o = d$1(e, t2.op);
+  const o = d(e, t2.op);
   if (f2(o)) return o;
-  const c2 = d$1(e, t2.op);
+  const c2 = d(e, t2.op);
   if (f2(c2)) return c2;
   const s2 = r2(c2, o);
   e.stack.push(s2);
@@ -1437,7 +1437,7 @@ const ne = {
       if (L$1(r2) || c(r2))
         return L$1(r2) && L$1(o) || c(r2) && c(o) ? r2.id === o.id : false;
       {
-        const c2 = F$1(r2), s2 = F$1(o);
+        const c2 = F$2(r2), s2 = F$2(o);
         return !isNaN(c2) && !isNaN(s2) ? c2 === s2 : u(r2) === u(o);
       }
     })
@@ -1453,7 +1453,7 @@ const ne = {
       if (L$1(r2) || c(r2))
         return L$1(r2) && L$1(o) || c(r2) && c(o) ? r2.id !== o.id : true;
       {
-        const c2 = F$1(r2), s2 = F$1(o);
+        const c2 = F$2(r2), s2 = F$2(o);
         return !isNaN(c2) && !isNaN(s2) ? c2 !== s2 : u(r2) !== u(o);
       }
     })
@@ -1462,7 +1462,7 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => v(e, t2, (r2, o) => {
-      const c2 = F$1(r2), s2 = F$1(o);
+      const c2 = F$2(r2), s2 = F$2(o);
       return c2 < s2;
     })
   },
@@ -1470,7 +1470,7 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => v(e, t2, (r2, o) => {
-      const c2 = F$1(r2), s2 = F$1(o);
+      const c2 = F$2(r2), s2 = F$2(o);
       return c2 > s2;
     })
   },
@@ -1478,7 +1478,7 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => v(e, t2, (r2, o) => {
-      const c2 = F$1(r2), s2 = F$1(o);
+      const c2 = F$2(r2), s2 = F$2(o);
       return c2 <= s2;
     })
   },
@@ -1486,7 +1486,7 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => v(e, t2, (r2, o) => {
-      const c2 = F$1(r2), s2 = F$1(o);
+      const c2 = F$2(r2), s2 = F$2(o);
       return c2 >= s2;
     })
   },
@@ -1505,9 +1505,9 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
       const c2 = M$2(o) ? r2 : o;
       e.stack.push(c2);
@@ -1517,9 +1517,9 @@ const ne = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
       const c2 = M$2(o) ? o : r2;
       e.stack.push(c2);
@@ -1529,7 +1529,7 @@ const ne = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       const o = !M$2(r2);
       e.stack.push(o);
@@ -1544,7 +1544,7 @@ const ne = {
     stackIn: 0,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = Y$1(), o = e.heap.allocate("array", r2);
+      const r2 = Y$2(), o = e.heap.allocate("array", r2);
       e.stack.push(o);
     }
   },
@@ -1568,7 +1568,7 @@ const ne = {
             opcode: t2.op
           };
         c2 = s2.data;
-      } else if (S$1(o))
+      } else if (S(o))
         c2 = o;
       else
         return {
@@ -1609,7 +1609,7 @@ const ne = {
         const u$1 = i2.data, y2 = u(r2), E3 = u$1.properties[y2] ?? s();
         e.stack.push(E3);
         return;
-      } else if (S$1(o))
+      } else if (S(o))
         c$1 = o;
       else if (_$1(o)) {
         let i2;
@@ -1679,7 +1679,7 @@ const ne = {
         const u$1 = i2.data, y2 = u(o);
         u$1.properties[y2] = r2, e.stack.push(c$1);
         return;
-      } else if (S$1(c$1))
+      } else if (S(c$1))
         s2 = c$1;
       else
         return {
@@ -1733,7 +1733,7 @@ const ne = {
             opcode: t2.op
           };
         o = c2.data;
-      } else if (S$1(r2))
+      } else if (S(r2))
         o = r2;
       else
         return {
@@ -1765,7 +1765,7 @@ const ne = {
           pc: e.pc,
           opcode: t2.op
         };
-      const s2 = c$1.data, p2 = Y$1();
+      const s2 = c$1.data, p2 = Y$2();
       for (const i2 of s2.elements)
         if (c(i2)) {
           const u$1 = e.heap.get(i2.id);
@@ -1800,7 +1800,7 @@ const ne = {
           pc: e.pc,
           opcode: t2.op
         };
-      const s2 = c$1.data, p2 = Y$1();
+      const s2 = c$1.data, p2 = Y$2();
       for (const i2 of s2.elements)
         if (c(i2)) {
           const u$1 = e.heap.get(i2.id);
@@ -1831,7 +1831,7 @@ const ne = {
           pc: e.pc,
           opcode: t2.op
         };
-      const a2 = e.heap.get(c2.id).data, i2 = E$2(o) ? o : 0, u2 = r2 === void 0 ? a2.elements.length : E$2(r2) ? r2 : a2.elements.length, y2 = i2 < 0 ? Math.max(0, a2.elements.length + i2) : i2, E3 = u2 < 0 ? Math.max(0, a2.elements.length + u2) : u2, Y2 = a2.elements.slice(y2, E3), z2 = Y$1(Y2), B2 = e.heap.allocate("array", z2);
+      const a2 = e.heap.get(c2.id).data, i2 = E$2(o) ? o : 0, u2 = r2 === void 0 ? a2.elements.length : E$2(r2) ? r2 : a2.elements.length, y2 = i2 < 0 ? Math.max(0, a2.elements.length + i2) : i2, E3 = u2 < 0 ? Math.max(0, a2.elements.length + u2) : u2, Y2 = a2.elements.slice(y2, E3), z2 = Y$2(Y2), B2 = e.heap.allocate("array", z2);
       e.stack.push(B2);
     }
   },
@@ -1893,7 +1893,7 @@ function M(e, t2) {
     if (typeof e == "string" || typeof e == "number" || typeof e == "boolean" || e && typeof e == "object" && e.type === "array" && Array.isArray(e.elements))
       return e;
     if (Array.isArray(e)) {
-      const r2 = Y$1();
+      const r2 = Y$2();
       return r2.elements = e.map((o) => M(o, t2)), t2.allocate("array", r2);
     }
     if (e && typeof e == "object" && e.type === "object" && e.properties)
@@ -1912,9 +1912,9 @@ const ie = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
       e.stack.push(u(o) + u(r2));
     }
@@ -1923,7 +1923,7 @@ const ie = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       if (!_$1(r2))
         return {
@@ -1939,11 +1939,11 @@ const ie = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       if (_$1(r2))
         e.stack.push(r2.length);
-      else if (S$1(r2))
+      else if (S(r2))
         e.stack.push(r2.elements.length);
       else if (L$1(r2)) {
         const o = e.heap.get(r2.id);
@@ -1969,7 +1969,7 @@ const ie = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       if (!_$1(r2))
         return {
@@ -1990,7 +1990,7 @@ const ie = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       e.stack.push(y$1(r2));
     }
@@ -2008,10 +2008,10 @@ const ie = {
           pc: e.pc,
           opcode: t2.op
         };
-      const o = e.variables.get(r2) ?? 0, c2 = F$1(o) + 1;
+      const o = e.variables.get(r2) ?? 0, c2 = F$2(o) + 1;
       e.variables.set(r2, c2);
       const s2 = t2.arg === true;
-      e.stack.push(s2 ? F$1(o) : c2);
+      e.stack.push(s2 ? F$2(o) : c2);
     }
   },
   [P$1.DEC]: {
@@ -2026,10 +2026,10 @@ const ie = {
           pc: e.pc,
           opcode: t2.op
         };
-      const o = e.variables.get(r2) ?? 0, c2 = F$1(o) - 1;
+      const o = e.variables.get(r2) ?? 0, c2 = F$2(o) - 1;
       e.variables.set(r2, c2);
       const s2 = t2.arg === true;
-      e.stack.push(s2 ? F$1(o) : c2);
+      e.stack.push(s2 ? F$2(o) : c2);
     }
   }
 }, le = {
@@ -2113,7 +2113,7 @@ const ie = {
             filter: i2.properties.filter
           };
         }
-      } else e.stack.length >= 2 && typeof c$1 == "object" && c$1 !== null && !S$1(c$1) && (o = e.stack.pop()), r2 = e.stack.pop();
+      } else e.stack.length >= 2 && typeof c$1 == "object" && c$1 !== null && !S(c$1) && (o = e.stack.pop()), r2 = e.stack.pop();
       if (!_$1(r2))
         return {
           type: "RuntimeError",
@@ -2129,7 +2129,7 @@ const ie = {
           opcode: t2.op
         };
       const s2 = e.fileSystem.listFiles(r2, o);
-      if (S$1(s2)) {
+      if (S(s2)) {
         const p2 = e.heap.allocate("array", s2);
         e.stack.push(p2);
       } else
@@ -2258,7 +2258,7 @@ const ie = {
         };
       let c2;
       r2 === "" ? c2 = o.split("") : c2 = o.split(r2);
-      const s2 = Y$1(c2), p2 = e.heap.allocate("array", s2);
+      const s2 = Y$2(c2), p2 = e.heap.allocate("array", s2);
       e.stack.push(p2);
     }
   },
@@ -2578,27 +2578,27 @@ const ie = {
     }
   }
 };
-function A(e, t2) {
+function A$1(e, t2) {
   if (L$1(e)) {
     const r2 = t2.get(e.id);
-    return r2 && r2.type === "array" ? r2.data.elements.map((c2) => A(c2, t2)) : null;
+    return r2 && r2.type === "array" ? r2.data.elements.map((c2) => A$1(c2, t2)) : null;
   }
   if (c(e)) {
     const r2 = t2.get(e.id);
     if (r2 && r2.type === "object") {
       const o = r2.data, c2 = {};
       for (const [s2, p2] of Object.entries(o.properties))
-        c2[s2] = A(p2, t2);
+        c2[s2] = A$1(p2, t2);
       return c2;
     }
     return null;
   }
-  if (S$1(e))
-    return e.elements.map((r2) => A(r2, t2));
+  if (S(e))
+    return e.elements.map((r2) => A$1(r2, t2));
   if (i(e)) {
     const r2 = {};
     for (const [o, c2] of Object.entries(e.properties))
-      r2[o] = A(c2, t2);
+      r2[o] = A$1(c2, t2);
     return r2;
   }
   if (!I$1(e))
@@ -2617,11 +2617,11 @@ const de = {
     stackIn: 3,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t2.op);
+      const o = d(e, t2.op);
       if (f2(o)) return o;
-      const c$1 = d$1(e, t2.op);
+      const c$1 = d(e, t2.op);
       if (f2(c$1)) return c$1;
       let s2;
       if (c(c$1)) {
@@ -2651,9 +2651,9 @@ const de = {
     stackIn: 2,
     stackOut: 1,
     execute: (e, t$1) => {
-      const r2 = d$1(e, t$1.op);
+      const r2 = d(e, t$1.op);
       if (f2(r2)) return r2;
-      const o = d$1(e, t$1.op);
+      const o = d(e, t$1.op);
       if (f2(o)) return o;
       if (t(o) || I$1(o))
         return {
@@ -2687,9 +2687,9 @@ const de = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
-      const o = A(r2, e.heap);
+      const o = A$1(r2, e.heap);
       e.stack.push(JSON.stringify(o));
     }
   },
@@ -2697,7 +2697,7 @@ const de = {
     stackIn: 1,
     stackOut: 1,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       if (c(r2)) {
         const o = e.heap.get(r2.id);
@@ -2718,7 +2718,7 @@ const de = {
     stackIn: 1,
     stackOut: 0,
     execute: (e, t2) => {
-      const r2 = d$1(e, t2.op);
+      const r2 = d(e, t2.op);
       if (f2(r2)) return r2;
       if (c(r2)) {
         const o = e.heap.get(r2.id);
@@ -2943,9 +2943,9 @@ const de = {
   stackOut: 1,
   // Produces boolean result
   execute: (e, t2) => {
-    const r2 = d$1(e, t2.op);
+    const r2 = d(e, t2.op);
     if (f2(r2)) return r2;
-    const o = d$1(e, t2.op);
+    const o = d(e, t2.op);
     if (f2(o)) return o;
     if (typeof r2 != "string")
       return {
@@ -2996,9 +2996,9 @@ const de = {
   stackOut: 1,
   // Produces array reference or null
   execute: (e, t2) => {
-    const r2 = d$1(e, t2.op);
+    const r2 = d(e, t2.op);
     if (f2(r2)) return r2;
-    const o = d$1(e, t2.op);
+    const o = d(e, t2.op);
     if (f2(o)) return o;
     if (typeof o != "string")
       return {
@@ -3058,11 +3058,11 @@ const de = {
   stackOut: 1,
   // Produces new string
   execute: (e, t2) => {
-    const r2 = d$1(e, t2.op);
+    const r2 = d(e, t2.op);
     if (f2(r2)) return r2;
-    const o = d$1(e, t2.op);
+    const o = d(e, t2.op);
     if (f2(o)) return o;
-    const c$1 = d$1(e, t2.op);
+    const c$1 = d(e, t2.op);
     if (f2(c$1)) return c$1;
     if (typeof c$1 != "string")
       return {
@@ -3268,7 +3268,7 @@ class G {
     return this.execute(o, s2, c2 || t2.fileSystem);
   }
 }
-class $ {
+let $$1 = class $ {
   constructor() {
     b(this, "sandboxPaths", []);
     const t2 = process.env.CVM_SANDBOX_PATHS, r2 = process.env.CVM_SANDBOX_ROOT;
@@ -3281,7 +3281,7 @@ class $ {
     );
   }
   listFiles(t2, r2 = {}) {
-    const o = Y$1();
+    const o = Y$2();
     if (!this.isPathAllowed(t2))
       return o;
     try {
@@ -3339,14 +3339,14 @@ class $ {
       return false;
     }
   }
-}
-new $();
+};
+new $$1();
 class ve {
   constructor(t2, r2) {
     b(this, "vms", /* @__PURE__ */ new Map());
     b(this, "storage");
     b(this, "fileSystem");
-    t2 ? this.storage = t2 : this.storage = E2.create(), this.fileSystem = r2 || new $();
+    t2 ? this.storage = t2 : this.storage = E2.create(), this.fileSystem = r2 || new $$1();
   }
   /**
    * Initialize the VMManager (connect to database)
@@ -3637,109 +3637,130 @@ class ve {
     return t2;
   }
 }
-var T = Object.defineProperty;
-var S = (m, r2, t2) => r2 in m ? T(m, r2, { enumerable: true, configurable: true, writable: true, value: t2 }) : m[r2] = t2;
-var d = (m, r2, t2) => S(m, typeof r2 != "symbol" ? r2 + "" : r2, t2);
-const B = /^\d{2}-[a-z0-9]+(-[a-z0-9]+)*$/;
-function D(m, r2) {
-  const t2 = m.split(`
-`), e = [];
-  let s2 = "", c2 = -1;
-  const l = [], h2 = /* @__PURE__ */ new Set();
+var U = Object.defineProperty;
+var A = (h2, r2, e) => r2 in h2 ? U(h2, r2, { enumerable: true, configurable: true, writable: true, value: e }) : h2[r2] = e;
+var $2 = (h2, r2, e) => A(h2, typeof r2 != "symbol" ? r2 + "" : r2, e);
+const F = /^\d{2}-[a-z0-9]+(-[a-z0-9]+)*$/;
+function j(h2) {
+  const r2 = h2.split(`
+`);
+  let e = 0;
+  for (; e < r2.length; ) {
+    if (r2[e].trim().startsWith("<files>")) {
+      const t2 = [];
+      for (e++; e < r2.length && !r2[e].trim().startsWith("</files>"); ) {
+        const s2 = r2[e].trim().match(/^-\s+(.+)/);
+        if (s2) {
+          const c2 = s2[1].trim();
+          c2 && t2.push(c2);
+        }
+        e++;
+      }
+      return t2;
+    }
+    e++;
+  }
+  return [];
+}
+function T(h2, r2, e) {
+  const t2 = h2.split(`
+`), s2 = [];
+  let c2 = "", m = -1;
+  const y2 = [], g2 = /* @__PURE__ */ new Set();
   let n2 = 0;
   for (; n2 < t2.length; ) {
     if (t2[n2].trim().startsWith("<mission>")) {
-      c2 = n2;
+      m = n2;
       const a2 = t2[n2].trim().replace("<mission>", "").replace("</mission>", "").trim();
       if (t2[n2].trim().endsWith("</mission>")) {
-        s2 = a2, n2++;
+        c2 = a2, n2++;
         break;
       }
-      const o = [];
-      for (a2 && o.push(a2), n2++; n2 < t2.length && !t2[n2].trim().startsWith("</mission>"); )
-        o.push(t2[n2]), n2++;
-      n2 < t2.length && n2++, s2 = o.join(`
+      const i2 = [];
+      for (a2 && i2.push(a2), n2++; n2 < t2.length && !t2[n2].trim().startsWith("</mission>"); )
+        i2.push(t2[n2]), n2++;
+      n2 < t2.length && n2++, c2 = i2.join(`
 `).trim();
       break;
     }
     n2++;
   }
-  for (c2 === -1 ? e.push({ line: 0, message: "Missing <mission> tag" }) : s2 || e.push({ line: c2 + 1, message: "<mission> tag is empty" }); n2 < t2.length; ) {
+  for (m === -1 ? ((e == null ? void 0 : e.requireMission) !== false && s2.push({ line: 0, message: "Missing <mission> tag" }), n2 = 0) : c2 || s2.push({ line: m + 1, message: "<mission> tag is empty" }); n2 < t2.length; ) {
     const a2 = t2[n2].trim().match(/^<block\s+id="([^"]+)">/);
     if (!a2) {
       n2++;
       continue;
     }
-    const o = a2[1], p2 = n2;
-    B.test(o) || e.push({ line: n2 + 1, message: `Block id "${o}" must be NN-kebab-case format` }), h2.has(o) && e.push({ line: n2 + 1, message: `Duplicate block id "${o}"` }), h2.add(o);
-    let k2 = "", x = "", E3 = [], v2 = [], f3 = -1, $2 = false, I2 = false, M2 = false;
+    const i2 = a2[1], p2 = n2;
+    F.test(i2) || s2.push({ line: n2 + 1, message: `Block id "${i2}" must be NN-kebab-case format` }), g2.has(i2) && s2.push({ line: n2 + 1, message: `Duplicate block id "${i2}"` }), g2.add(i2);
+    let k2 = "", u2 = "", d2 = [], w2 = [], E3 = -1, l = false, x = false, N2 = false;
     for (n2++; n2 < t2.length; ) {
-      const g2 = t2[n2].trim();
-      if (g2.startsWith("</block>")) {
-        f3 = n2, n2++;
+      const v2 = t2[n2].trim();
+      if (v2.startsWith("</block>")) {
+        E3 = n2, n2++;
         break;
       }
-      const b2 = g2.match(/^##\s+TDDAB-\d+:\s+(.+)/);
-      if (b2) {
-        k2 = b2[1], n2++;
+      const S2 = v2.match(/^##\s+TDDAB-\d+:\s+(.+)/);
+      if (S2) {
+        k2 = S2[1], n2++;
         continue;
       }
-      if (g2.startsWith("<intro>")) {
-        $2 = true;
-        const u2 = [], w2 = g2.replace("<intro>", "").replace("</intro>", "").trim();
-        if (g2.includes("</intro>")) {
-          x = w2, n2++;
+      if (v2.startsWith("<intro>")) {
+        l = true;
+        const f3 = [], M2 = v2.replace("<intro>", "").replace("</intro>", "").trim();
+        if (v2.includes("</intro>")) {
+          u2 = M2, n2++;
           continue;
         }
-        for (w2 && u2.push(w2), n2++; n2 < t2.length && !t2[n2].trim().startsWith("</intro>"); )
-          u2.push(t2[n2]), n2++;
-        n2 < t2.length && n2++, x = u2.join(`
+        for (M2 && f3.push(M2), n2++; n2 < t2.length && !t2[n2].trim().startsWith("</intro>"); )
+          f3.push(t2[n2]), n2++;
+        n2 < t2.length && n2++, u2 = f3.join(`
 `).trim();
         continue;
       }
-      if (g2.startsWith("<red>")) {
-        for (I2 = true, n2++; n2 < t2.length && !t2[n2].trim().startsWith("</red>"); ) {
-          const u2 = t2[n2].trim().match(/^-\s*test:\s*(.+)/);
-          u2 && E3.push(u2[1].trim()), n2++;
+      if (v2.startsWith("<red>")) {
+        for (x = true, n2++; n2 < t2.length && !t2[n2].trim().startsWith("</red>"); ) {
+          const f3 = t2[n2].trim().match(/^-\s*test:\s*(.+)/);
+          f3 && d2.push(f3[1].trim()), n2++;
         }
         n2 < t2.length && n2++;
         continue;
       }
-      if (g2.startsWith("<success>")) {
-        for (M2 = true, n2++; n2 < t2.length && !t2[n2].trim().startsWith("</success>"); ) {
-          const u2 = t2[n2].trim().match(/^-\s*\[\s*\]\s*(.+)/);
-          u2 && v2.push(u2[1].trim()), n2++;
+      if (v2.startsWith("<success>")) {
+        for (N2 = true, n2++; n2 < t2.length && !t2[n2].trim().startsWith("</success>"); ) {
+          const f3 = t2[n2].trim().match(/^-\s*\[\s*\]\s*(.+)/);
+          f3 && w2.push(f3[1].trim()), n2++;
         }
         n2 < t2.length && n2++;
         continue;
       }
       n2++;
     }
-    f3 === -1 && (e.push({ line: p2 + 1, message: `Block "${o}" never closed with </block>` }), f3 = t2.length - 1), $2 ? x || e.push({ line: p2 + 1, message: `Block "${o}" has empty <intro>` }) : e.push({ line: p2 + 1, message: `Block "${o}" missing <intro> tag` }), I2 ? E3.length === 0 && e.push({ line: p2 + 1, message: `Block "${o}" has <red> but no "- test:" lines` }) : e.push({ line: p2 + 1, message: `Block "${o}" missing <red> tag` }), M2 ? v2.length === 0 && e.push({ line: p2 + 1, message: `Block "${o}" has <success> but no "- [ ]" items` }) : e.push({ line: p2 + 1, message: `Block "${o}" missing <success> tag` }), l.push({
-      id: o,
+    E3 === -1 && (s2.push({ line: p2 + 1, message: `Block "${i2}" never closed with </block>` }), E3 = t2.length - 1), l ? u2 || s2.push({ line: p2 + 1, message: `Block "${i2}" has empty <intro>` }) : s2.push({ line: p2 + 1, message: `Block "${i2}" missing <intro> tag` }), x ? d2.length === 0 && s2.push({ line: p2 + 1, message: `Block "${i2}" has <red> but no "- test:" lines` }) : s2.push({ line: p2 + 1, message: `Block "${i2}" missing <red> tag` }), N2 ? w2.length === 0 && s2.push({ line: p2 + 1, message: `Block "${i2}" has <success> but no "- [ ]" items` }) : s2.push({ line: p2 + 1, message: `Block "${i2}" missing <success> tag` }), y2.push({
+      id: i2,
       title: k2,
-      intro: x,
-      redTests: E3,
-      success: v2,
+      intro: u2,
+      redTests: d2,
+      success: w2,
       startLine: p2 + 1,
-      endLine: f3 + 1
+      endLine: E3 + 1
     });
   }
-  return l.length === 0 && !e.some((a2) => a2.message.includes("block")) && e.push({ line: 0, message: "No <block> tags found" }), e.length > 0 ? { valid: false, plan: null, errors: e } : {
+  return y2.length === 0 && (e == null ? void 0 : e.requireBlocks) !== false && !s2.some((a2) => a2.message.includes("block")) && s2.push({ line: 0, message: "No <block> tags found" }), s2.length > 0 ? { valid: false, plan: null, errors: s2 } : {
     valid: true,
-    plan: { mission: s2, blocks: l, sourceFile: r2 },
+    plan: { mission: c2, blocks: y2, sourceFile: r2 },
     errors: []
   };
 }
 const J = {
   "@planexecutor": "planexecutor.ts"
 };
-class Q {
+class Y {
   constructor(r2 = "0.0.1") {
-    d(this, "server");
-    d(this, "transport", null);
-    d(this, "vmManager");
-    d(this, "version");
+    $2(this, "server");
+    $2(this, "transport", null);
+    $2(this, "vmManager");
+    $2(this, "version");
     this.version = r2, this.vmManager = new ve(), this.server = new mcp_js.McpServer({
       name: "cvm-server",
       version: this.version
@@ -3753,19 +3774,36 @@ class Q {
   }
   setupTools() {
     this.server.tool(
+      "server_info",
+      {},
+      async () => {
+        const r2 = await this.vmManager.listPrograms(), e = await this.vmManager.listExecutions();
+        return {
+          content: [{
+            type: "text",
+            text: JSON.stringify({
+              name: "cvm-server",
+              version: this.version,
+              programs: r2.length,
+              executions: e.length
+            }, null, 2)
+          }]
+        };
+      }
+    ), this.server.tool(
       "load",
       {
         programId: zod.z.string(),
         source: zod.z.string()
       },
-      async ({ programId: r2, source: t2 }) => {
+      async ({ programId: r2, source: e }) => {
         try {
-          return await this.vmManager.loadProgram(r2, t2), {
+          return await this.vmManager.loadProgram(r2, e), {
             content: [{ type: "text", text: `Program loaded successfully: ${r2}` }]
           };
-        } catch (e) {
+        } catch (t2) {
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -3776,35 +3814,35 @@ class Q {
         programId: zod.z.string(),
         filePath: zod.z.string()
       },
-      async ({ programId: r2, filePath: t2 }) => {
+      async ({ programId: r2, filePath: e }) => {
         try {
-          let e;
-          const s2 = J[t2];
+          let t2;
+          const s2 = J[e];
           if (s2) {
-            const l = r$2.dirname(url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("main.cjs", document.baseURI).href));
-            e = r$2.join(l, "programs", s2);
+            const m = r$2.dirname(url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("main.cjs", document.baseURI).href));
+            t2 = r$2.join(m, "programs", s2);
           } else
-            e = r$2.resolve(t2);
-          const c2 = await promises.readFile(e, "utf-8");
+            t2 = r$2.resolve(e);
+          const c2 = await promises.readFile(t2, "utf-8");
           return await this.vmManager.loadProgram(r2, c2), {
-            content: [{ type: "text", text: `Program loaded successfully from ${t2}: ${r2}` }]
+            content: [{ type: "text", text: `Program loaded successfully from ${e}: ${r2}` }]
           };
-        } catch (e) {
-          if (e instanceof Error) {
-            const s2 = e;
+        } catch (t2) {
+          if (t2 instanceof Error) {
+            const s2 = t2;
             if (s2.code === "ENOENT")
               return {
-                content: [{ type: "text", text: `Error: File not found: ${t2}` }],
+                content: [{ type: "text", text: `Error: File not found: ${e}` }],
                 isError: true
               };
             if (s2.code === "EACCES")
               return {
-                content: [{ type: "text", text: `Error: Permission denied: ${t2}` }],
+                content: [{ type: "text", text: `Error: Permission denied: ${e}` }],
                 isError: true
               };
           }
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -3816,10 +3854,10 @@ class Q {
         executionId: zod.z.string(),
         setCurrent: zod.z.boolean().optional()
       },
-      async ({ programId: r2, executionId: t2, setCurrent: e = true }) => {
+      async ({ programId: r2, executionId: e, setCurrent: t2 = true }) => {
         try {
-          return await this.vmManager.startExecution(r2, t2), e && await this.vmManager.setCurrentExecutionId(t2), {
-            content: [{ type: "text", text: `Execution started: ${t2}${e ? " (set as current)" : ""}` }]
+          return await this.vmManager.startExecution(r2, e), t2 && await this.vmManager.setCurrentExecutionId(e), {
+            content: [{ type: "text", text: `Execution started: ${e}${t2 ? " (set as current)" : ""}` }]
           };
         } catch (s2) {
           return {
@@ -3835,30 +3873,30 @@ class Q {
       },
       async ({ executionId: r2 }) => {
         try {
-          let t2 = r2;
-          if (!t2) {
+          let e = r2;
+          if (!e) {
             const s2 = await this.vmManager.getCurrentExecutionId();
             if (!s2)
               return {
                 content: [{ type: "text", text: "No current execution set. Use list_executions to see available executions." }]
               };
-            t2 = s2;
+            e = s2;
           }
-          const e = await this.vmManager.getNext(t2);
-          return e.type === "completed" ? {
-            content: [{ type: "text", text: e.result !== void 0 ? `Execution completed with result: ${JSON.stringify(e.result)}` : "Execution completed" }]
-          } : e.type === "waiting" ? {
-            content: [{ type: "text", text: e.message || "Waiting for input" }]
-          } : e.type === "error" ? {
-            content: [{ type: "text", text: `Error: ${e.error}` }],
+          const t2 = await this.vmManager.getNext(e);
+          return t2.type === "completed" ? {
+            content: [{ type: "text", text: t2.result !== void 0 ? `Execution completed with result: ${JSON.stringify(t2.result)}` : "Execution completed" }]
+          } : t2.type === "waiting" ? {
+            content: [{ type: "text", text: t2.message || "Waiting for input" }]
+          } : t2.type === "error" ? {
+            content: [{ type: "text", text: `Error: ${t2.error}` }],
             isError: true
           } : {
             content: [{ type: "text", text: "Unexpected state" }],
             isError: true
           };
-        } catch (t2) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -3869,24 +3907,24 @@ class Q {
         executionId: zod.z.string().optional(),
         result: zod.z.string()
       },
-      async ({ executionId: r2, result: t2 }) => {
+      async ({ executionId: r2, result: e }) => {
         try {
-          let e = r2;
-          if (!e) {
+          let t2 = r2;
+          if (!t2) {
             const s2 = await this.vmManager.getCurrentExecutionId();
             if (!s2)
               return {
                 content: [{ type: "text", text: "Error: No current execution set" }],
                 isError: true
               };
-            e = s2;
+            t2 = s2;
           }
-          return await this.vmManager.reportCCResult(e, t2), {
+          return await this.vmManager.reportCCResult(t2, e), {
             content: [{ type: "text", text: "Execution resumed" }]
           };
-        } catch (e) {
+        } catch (t2) {
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -3898,23 +3936,23 @@ class Q {
       },
       async ({ executionId: r2 }) => {
         try {
-          let t2 = r2;
-          if (!t2) {
+          let e = r2;
+          if (!e) {
             const s2 = await this.vmManager.getCurrentExecutionId();
             if (!s2)
               return {
                 content: [{ type: "text", text: "Error: No current execution set" }],
                 isError: true
               };
-            t2 = s2;
+            e = s2;
           }
-          const e = await this.vmManager.getExecutionStatus(t2);
+          const t2 = await this.vmManager.getExecutionStatus(e);
           return {
-            content: [{ type: "text", text: JSON.stringify(e, null, 2) }]
+            content: [{ type: "text", text: JSON.stringify(t2, null, 2) }]
           };
-        } catch (t2) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -3924,12 +3962,12 @@ class Q {
       {},
       async () => {
         try {
-          const r2 = await this.vmManager.listExecutions(), t2 = await this.vmManager.getCurrentExecutionId(), e = r2.map((s2) => ({
+          const r2 = await this.vmManager.listExecutions(), e = await this.vmManager.getCurrentExecutionId(), t2 = r2.map((s2) => ({
             executionId: s2.id,
             programId: s2.programId,
             state: s2.state,
             created: s2.created,
-            isCurrent: s2.id === t2,
+            isCurrent: s2.id === e,
             summary: {
               currentPrompt: s2.state === "AWAITING_COGNITIVE_RESULT" ? s2.ccPrompt : void 0,
               tasksCompleted: 0
@@ -3937,7 +3975,7 @@ class Q {
             }
           }));
           return {
-            content: [{ type: "text", text: JSON.stringify(e, null, 2) }]
+            content: [{ type: "text", text: JSON.stringify(t2, null, 2) }]
           };
         } catch (r2) {
           return {
@@ -3953,29 +3991,29 @@ class Q {
       },
       async ({ executionId: r2 }) => {
         try {
-          let t2 = r2;
-          if (!t2) {
-            const l = await this.vmManager.getCurrentExecutionId();
-            if (!l)
+          let e = r2;
+          if (!e) {
+            const m = await this.vmManager.getCurrentExecutionId();
+            if (!m)
               return {
                 content: [{ type: "text", text: "Error: No current execution set" }],
                 isError: true
               };
-            t2 = l;
+            e = m;
           }
-          const e = await this.vmManager.getExecutionWithAttempts(t2), s2 = await this.vmManager.getCurrentExecutionId(), c2 = {
-            executionId: e.id,
-            programId: e.programId,
-            state: e.state,
-            created: e.created,
-            isCurrent: e.id === s2,
-            currentTask: e.state === "AWAITING_COGNITIVE_RESULT" ? {
-              prompt: e.ccPrompt,
-              attempts: e.attempts || 1,
-              firstAttemptAt: e.firstAttemptAt || e.created,
-              lastAttemptAt: e.lastAttemptAt || e.created
+          const t2 = await this.vmManager.getExecutionWithAttempts(e), s2 = await this.vmManager.getCurrentExecutionId(), c2 = {
+            executionId: t2.id,
+            programId: t2.programId,
+            state: t2.state,
+            created: t2.created,
+            isCurrent: t2.id === s2,
+            currentTask: t2.state === "AWAITING_COGNITIVE_RESULT" ? {
+              prompt: t2.ccPrompt,
+              attempts: t2.attempts || 1,
+              firstAttemptAt: t2.firstAttemptAt || t2.created,
+              lastAttemptAt: t2.lastAttemptAt || t2.created
             } : void 0,
-            variables: e.variables,
+            variables: t2.variables,
             stats: {
               tasksCompleted: 0
               // TODO: Track this
@@ -3984,9 +4022,9 @@ class Q {
           return {
             content: [{ type: "text", text: JSON.stringify(c2, null, 2) }]
           };
-        } catch (t2) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4001,9 +4039,9 @@ class Q {
           return await this.vmManager.setCurrentExecutionId(r2), {
             content: [{ type: "text", text: `Current execution set to: ${r2}` }]
           };
-        } catch (t2) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4014,10 +4052,10 @@ class Q {
         executionId: zod.z.string(),
         confirmToken: zod.z.string().optional()
       },
-      async ({ executionId: r2, confirmToken: t2 }) => {
+      async ({ executionId: r2, confirmToken: e }) => {
         try {
-          const e = `delete-${r2}-${Date.now()}`;
-          return t2 ? t2 && t2.startsWith(`delete-${r2}-`) ? (await this.vmManager.deleteExecution(r2), {
+          const t2 = `delete-${r2}-${Date.now()}`;
+          return e ? e && e.startsWith(`delete-${r2}-`) ? (await this.vmManager.deleteExecution(r2), {
             content: [{ type: "text", text: `Execution deleted: ${r2}` }]
           }) : {
             content: [{ type: "text", text: "Invalid confirmation token" }],
@@ -4028,13 +4066,13 @@ class Q {
               text: JSON.stringify({
                 confirmationRequired: true,
                 message: `To delete execution '${r2}', call this tool again with the confirmation token`,
-                token: e
+                token: t2
               }, null, 2)
             }]
           };
-        } catch (e) {
+        } catch (t2) {
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4049,13 +4087,13 @@ class Q {
             return {
               content: [{ type: "text", text: "No programs loaded" }]
             };
-          const t2 = r2.map((e) => ({
-            programId: e.id,
-            name: e.name,
-            created: e.created
+          const e = r2.map((t2) => ({
+            programId: t2.id,
+            name: t2.name,
+            created: t2.created
           }));
           return {
-            content: [{ type: "text", text: JSON.stringify(t2, null, 2) }]
+            content: [{ type: "text", text: JSON.stringify(e, null, 2) }]
           };
         } catch (r2) {
           return {
@@ -4070,10 +4108,10 @@ class Q {
         programId: zod.z.string(),
         confirmToken: zod.z.string().optional()
       },
-      async ({ programId: r2, confirmToken: t2 }) => {
+      async ({ programId: r2, confirmToken: e }) => {
         try {
-          const e = `delete-${r2}-${Date.now()}`;
-          return t2 ? t2 && t2.startsWith(`delete-${r2}-`) ? (await this.vmManager.deleteProgram(r2), {
+          const t2 = `delete-${r2}-${Date.now()}`;
+          return e ? e && e.startsWith(`delete-${r2}-`) ? (await this.vmManager.deleteProgram(r2), {
             content: [{ type: "text", text: `Program deleted: ${r2}` }]
           }) : {
             content: [{ type: "text", text: "Invalid confirmation token" }],
@@ -4084,13 +4122,13 @@ class Q {
               text: JSON.stringify({
                 confirmationRequired: true,
                 message: `To delete program '${r2}', call this tool again with the confirmation token`,
-                token: e
+                token: t2
               }, null, 2)
             }]
           };
-        } catch (e) {
+        } catch (t2) {
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4101,14 +4139,14 @@ class Q {
         programId: zod.z.string(),
         executionId: zod.z.string().optional()
       },
-      async ({ programId: r2, executionId: t2 }) => {
+      async ({ programId: r2, executionId: e }) => {
         try {
           return {
-            content: [{ type: "text", text: `Execution started: ${await this.vmManager.restartExecution(r2, t2)} (set as current)` }]
+            content: [{ type: "text", text: `Execution started: ${await this.vmManager.restartExecution(r2, e)} (set as current)` }]
           };
-        } catch (e) {
+        } catch (t2) {
           return {
-            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4118,48 +4156,110 @@ class Q {
       { filePath: zod.z.string() },
       async ({ filePath: r2 }) => {
         try {
-          const t2 = r$2.resolve(r2), e = await promises.readFile(t2, "utf-8"), s2 = D(e, r2);
-          if (!s2.valid)
-            return {
-              content: [{ type: "text", text: `Plan validation failed:
-${s2.errors.map((o) => `line ${o.line}: ${o.message}`).join(`
+          const e = r$2.resolve(r2), t2 = await promises.readFile(e, "utf-8"), s2 = j(t2);
+          let c2;
+          if (s2.length === 0) {
+            const g2 = T(t2, r2);
+            if (!g2.valid)
+              return {
+                content: [{ type: "text", text: `Plan validation failed:
+${g2.errors.map((i2) => `line ${i2.line}: ${i2.message}`).join(`
 `)}` }],
-              isError: true
+                isError: true
+              };
+            const n2 = g2.plan;
+            c2 = {
+              mission: n2.mission,
+              sourceFile: n2.sourceFile,
+              blocks: n2.blocks.map((a2) => ({
+                id: a2.id,
+                title: a2.title,
+                intro: a2.intro,
+                red: a2.redTests.map((i2) => "- " + i2).join(`
+`),
+                success: a2.success.map((i2) => "- [ ] " + i2).join(`
+`),
+                planRef: `See ${n2.sourceFile} lines ${a2.startLine}-${a2.endLine}`
+              }))
             };
-          const c2 = s2.plan, l = {
-            mission: c2.mission,
-            sourceFile: c2.sourceFile,
-            blocks: c2.blocks.map((a2) => ({
-              id: a2.id,
-              title: a2.title,
-              intro: a2.intro,
-              red: a2.redTests.map((o) => "- " + o).join(`
+          } else {
+            const g2 = r$2.dirname(e), n2 = T(t2, r2, { requireBlocks: false });
+            if (!n2.valid)
+              return {
+                content: [{ type: "text", text: `Index plan validation failed:
+${n2.errors.map((d2) => `line ${d2.line}: ${d2.message}`).join(`
+`)}` }],
+                isError: true
+              };
+            const a2 = n2.plan.mission, i2 = [], p2 = /* @__PURE__ */ new Set(), k2 = [e];
+            for (const u2 of s2) {
+              const d2 = r$2.resolve(g2, u2);
+              let w2;
+              try {
+                w2 = await promises.readFile(d2, "utf-8");
+              } catch {
+                return {
+                  content: [{ type: "text", text: `Error: Sub-file not found: ${u2}` }],
+                  isError: true
+                };
+              }
+              const E3 = T(w2, u2, { requireMission: false });
+              if (!E3.valid) {
+                const l = E3.errors.map((x) => `${u2} line ${x.line}: ${x.message}`).join(`
+`);
+                return {
+                  content: [{ type: "text", text: `Plan validation failed in ${u2}:
+${l}` }],
+                  isError: true
+                };
+              }
+              k2.push(d2);
+              for (const l of E3.plan.blocks) {
+                if (p2.has(l.id))
+                  return {
+                    content: [{ type: "text", text: `Error: Duplicate block id "${l.id}" in ${u2}` }],
+                    isError: true
+                  };
+                p2.add(l.id), i2.push({
+                  id: l.id,
+                  title: l.title,
+                  intro: l.intro,
+                  red: l.redTests.map((x) => "- " + x).join(`
 `),
-              success: a2.success.map((o) => "- [ ] " + o).join(`
+                  success: l.success.map((x) => "- [ ] " + x).join(`
 `),
-              planRef: `See ${c2.sourceFile} lines ${a2.startLine}-${a2.endLine}`
-            }))
-          }, h2 = r$2.resolve(process.env.CVM_DATA_DIR || ".cvm");
-          await promises.mkdir(h2, { recursive: true });
-          const n2 = r$2.resolve(h2, "uplan.json");
+                  planRef: `See ${d2} lines ${l.startLine}-${l.endLine}`
+                });
+              }
+            }
+            c2 = {
+              mission: a2,
+              sourceFile: e,
+              sourceFiles: k2,
+              blocks: i2
+            };
+          }
+          const m = r$2.resolve(process.env.CVM_DATA_DIR || ".cvm");
+          await promises.mkdir(m, { recursive: true });
+          const y2 = r$2.resolve(m, "uplan.json");
           try {
-            await promises.rename(n2, n2 + ".bak");
+            await promises.rename(y2, y2 + ".bak");
           } catch {
           }
-          return await promises.writeFile(n2, JSON.stringify(l, null, 2), "utf-8"), {
+          return await promises.writeFile(y2, JSON.stringify(c2, null, 2), "utf-8"), {
             content: [{
               type: "text",
               text: JSON.stringify({
                 valid: true,
                 blocks: c2.blocks.length,
-                path: n2,
-                blockIds: c2.blocks.map((a2) => a2.id)
+                path: y2,
+                blockIds: c2.blocks.map((g2) => g2.id)
               }, null, 2)
             }]
           };
-        } catch (t2) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${t2 instanceof Error ? t2.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -4251,7 +4351,7 @@ async function main() {
     } else {
       g.info("[CVM] Using MongoDB storage");
     }
-    cvmServer = new Q(version);
+    cvmServer = new Y(version);
     await cvmServer.start();
     g.info("CVM Server is running and ready to accept MCP connections");
     process.on("SIGINT", async () => {