cvm-server 0.3.2 → 0.3.3

package/main.js

@@ -4,9 +4,9 @@ const stdio_js = require("@modelcontextprotocol/sdk/server/stdio.js");
 const zod = require("zod");
 const t = require("typescript");
 const fs = require("fs");
-const s = require("path");
+const s$1 = require("path");
 const mongodb = require("mongodb");
-const h = require("os");
+const h$1 = require("os");
 const dotenv = require("dotenv");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -25,74 +25,74 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const t__namespace = /* @__PURE__ */ _interopNamespaceDefault(t);
-const s__namespace = /* @__PURE__ */ _interopNamespaceDefault(s);
-const h__namespace = /* @__PURE__ */ _interopNamespaceDefault(h);
+const s__namespace = /* @__PURE__ */ _interopNamespaceDefault(s$1);
+const h__namespace = /* @__PURE__ */ _interopNamespaceDefault(h$1);
 const dotenv__namespace = /* @__PURE__ */ _interopNamespaceDefault(dotenv);
-var a = /* @__PURE__ */ ((i2) => (i2.PUSH = "PUSH", i2.POP = "POP", i2.LOAD = "LOAD", i2.STORE = "STORE", i2.CONCAT = "CONCAT", i2.JUMP = "JUMP", i2.JUMP_IF = "JUMP_IF", i2.CALL = "CALL", i2.RETURN = "RETURN", i2.CC = "CC", i2.PRINT = "PRINT", i2.HALT = "HALT", i2))(a || {});
-function l$2(i2) {
-  const p3 = [], r2 = [];
-  let u2 = false, c2 = false;
+var a$1 = /* @__PURE__ */ ((i3) => (i3.PUSH = "PUSH", i3.POP = "POP", i3.LOAD = "LOAD", i3.STORE = "STORE", i3.CONCAT = "CONCAT", i3.JUMP = "JUMP", i3.JUMP_IF = "JUMP_IF", i3.CALL = "CALL", i3.RETURN = "RETURN", i3.CC = "CC", i3.PRINT = "PRINT", i3.HALT = "HALT", i3))(a$1 || {});
+function l$2(i3) {
+  const p2 = [], r2 = [];
+  let u2 = false, c = false;
   const o = t__namespace.createSourceFile(
     "program.ts",
-    i2,
+    i3,
     t__namespace.ScriptTarget.Latest,
     true
   );
   function s2(e) {
-    if (t__namespace.isFunctionDeclaration(e) && e.name && e.name.text === "main" && (u2 = true, e.parameters.length > 0 && p3.push("main() must not have parameters")), t__namespace.isExpressionStatement(e) && e.parent === o) {
+    if (t__namespace.isFunctionDeclaration(e) && e.name && e.name.text === "main" && (u2 = true, e.parameters.length > 0 && p2.push("main() must not have parameters")), t__namespace.isExpressionStatement(e) && e.parent === o) {
       const n = e.expression;
-      t__namespace.isCallExpression(n) && t__namespace.isIdentifier(n.expression) && n.expression.text === "main" && (c2 = true);
+      t__namespace.isCallExpression(n) && t__namespace.isIdentifier(n.expression) && n.expression.text === "main" && (c = true);
     }
     if (t__namespace.isCallExpression(e) && t__namespace.isIdentifier(e.expression)) {
       const n = e.expression.text;
-      ["setTimeout", "fetch", "require", "import"].includes(n) && p3.push(`Unsupported function: ${n}`);
+      ["setTimeout", "fetch", "require", "import"].includes(n) && p2.push(`Unsupported function: ${n}`);
     }
     t__namespace.forEachChild(e, s2);
   }
-  return s2(o), u2 || p3.push("Program must have a main() function"), u2 && !c2 && p3.push("main() must be called at the top level"), p3.length === 0 && r2.push({ op: a.HALT }), {
+  return s2(o), u2 || p2.push("Program must have a main() function"), u2 && !c && p2.push("main() must be called at the top level"), p2.length === 0 && r2.push({ op: a$1.HALT }), {
     bytecode: r2,
-    errors: p3,
+    errors: p2,
     hasMain: u2
   };
 }
-function m$1(i2) {
-  const p3 = l$2(i2);
-  if (p3.errors.length > 0)
+function m$1(i3) {
+  const p2 = l$2(i3);
+  if (p2.errors.length > 0)
     return {
       success: false,
       bytecode: [],
-      errors: p3.errors
+      errors: p2.errors
     };
-  const r2 = [], u2 = t__namespace.createSourceFile("program.ts", i2, t__namespace.ScriptTarget.Latest, true);
-  function c2(s2) {
+  const r2 = [], u2 = t__namespace.createSourceFile("program.ts", i3, t__namespace.ScriptTarget.Latest, true);
+  function c(s2) {
     if (t__namespace.isExpressionStatement(s2)) {
       const e = s2.expression;
       t__namespace.isCallExpression(e) && t__namespace.isPropertyAccessExpression(e.expression) && e.expression.expression.getText() === "console" && e.expression.name.getText() === "log" ? (e.arguments.forEach((n) => {
         o(n);
-      }), r2.push({ op: a.PRINT })) : t__namespace.isCallExpression(e) && t__namespace.isIdentifier(e.expression) && e.expression.text === "CC" && (e.arguments.length > 0 && o(e.arguments[0]), r2.push({ op: a.CC }), r2.push({ op: a.POP }));
+      }), r2.push({ op: a$1.PRINT })) : t__namespace.isCallExpression(e) && t__namespace.isIdentifier(e.expression) && e.expression.text === "CC" && (e.arguments.length > 0 && o(e.arguments[0]), r2.push({ op: a$1.CC }), r2.push({ op: a$1.POP }));
     } else if (t__namespace.isVariableStatement(s2)) {
       const e = s2.declarationList.declarations[0];
-      e.initializer && (o(e.initializer), r2.push({ op: a.STORE, arg: e.name.getText() }));
+      e.initializer && (o(e.initializer), r2.push({ op: a$1.STORE, arg: e.name.getText() }));
     }
   }
   function o(s2) {
-    t__namespace.isStringLiteral(s2) ? r2.push({ op: a.PUSH, arg: s2.text }) : t__namespace.isIdentifier(s2) ? r2.push({ op: a.LOAD, arg: s2.text }) : t__namespace.isCallExpression(s2) && t__namespace.isIdentifier(s2.expression) && s2.expression.text === "CC" ? (s2.arguments.length > 0 && o(s2.arguments[0]), r2.push({ op: a.CC })) : t__namespace.isBinaryExpression(s2) && s2.operatorToken.kind === t__namespace.SyntaxKind.PlusToken && (o(s2.left), o(s2.right), r2.push({ op: a.CONCAT }));
+    t__namespace.isStringLiteral(s2) ? r2.push({ op: a$1.PUSH, arg: s2.text }) : t__namespace.isIdentifier(s2) ? r2.push({ op: a$1.LOAD, arg: s2.text }) : t__namespace.isCallExpression(s2) && t__namespace.isIdentifier(s2.expression) && s2.expression.text === "CC" ? (s2.arguments.length > 0 && o(s2.arguments[0]), r2.push({ op: a$1.CC })) : t__namespace.isBinaryExpression(s2) && s2.operatorToken.kind === t__namespace.SyntaxKind.PlusToken && (o(s2.left), o(s2.right), r2.push({ op: a$1.CONCAT }));
   }
   return u2.forEachChild((s2) => {
     var e;
     t__namespace.isFunctionDeclaration(s2) && ((e = s2.name) == null ? void 0 : e.text) === "main" && s2.body && s2.body.statements.forEach((n) => {
-      c2(n);
+      c(n);
     });
-  }), r2.push({ op: a.HALT }), {
+  }), r2.push({ op: a$1.HALT }), {
     success: true,
     bytecode: r2,
     errors: []
   };
 }
 var l$1 = Object.defineProperty;
-var d = (i2, t2, e) => t2 in i2 ? l$1(i2, t2, { enumerable: true, configurable: true, writable: true, value: e }) : i2[t2] = e;
-var r = (i2, t2, e) => d(i2, typeof t2 != "symbol" ? t2 + "" : t2, e);
-let p$1 = class p {
+var d = (i3, t2, e) => t2 in i3 ? l$1(i3, t2, { enumerable: true, configurable: true, writable: true, value: e }) : i3[t2] = e;
+var r = (i3, t2, e) => d(i3, typeof t2 != "symbol" ? t2 + "" : t2, e);
+class p {
   constructor(t2) {
     r(this, "connected", false);
     r(this, "programsDir");
@@ -142,7 +142,7 @@ let p$1 = class p {
       throw o;
     }
   }
-};
+}
 let w$1 = class w {
   constructor(t2) {
     r(this, "client");
@@ -199,7 +199,7 @@ class g {
     switch (e) {
       case "file": {
         const o = (t2 == null ? void 0 : t2.dataDir) || process.env.CVM_DATA_DIR || s__namespace.join(h__namespace.homedir(), ".cvm");
-        return new p$1(o);
+        return new p(o);
       }
       case "mongodb": {
         const o = (t2 == null ? void 0 : t2.mongoUri) || process.env.MONGODB_URI || "mongodb://localhost:27017/cvm";
@@ -211,9 +211,9 @@ class g {
   }
 }
 var m = Object.defineProperty;
-var w2 = (p3, s2, t2) => s2 in p3 ? m(p3, s2, { enumerable: true, configurable: true, writable: true, value: t2 }) : p3[s2] = t2;
-var u = (p3, s2, t2) => w2(p3, typeof s2 != "symbol" ? s2 + "" : s2, t2);
-class i {
+var w2 = (p2, s2, t2) => s2 in p2 ? m(p2, s2, { enumerable: true, configurable: true, writable: true, value: t2 }) : p2[s2] = t2;
+var u = (p2, s2, t2) => w2(p2, typeof s2 != "symbol" ? s2 + "" : s2, t2);
+let i$1 = class i {
   execute(s2, t2) {
     const e = {
       pc: (t2 == null ? void 0 : t2.pc) ?? 0,
@@ -226,31 +226,31 @@ class i {
     for (; e.status === "running" && e.pc < s2.length; ) {
       const r2 = s2[e.pc];
       switch (r2.op) {
-        case a.HALT:
+        case a$1.HALT:
           e.status = "complete";
           break;
-        case a.PUSH:
+        case a$1.PUSH:
           e.stack.push(r2.arg), e.pc++;
           break;
-        case a.POP:
+        case a$1.POP:
           e.stack.pop(), e.pc++;
           break;
-        case a.LOAD:
+        case a$1.LOAD:
           e.stack.push(e.variables.get(r2.arg) ?? ""), e.pc++;
           break;
-        case a.STORE:
-          const c2 = e.stack.pop();
-          e.variables.set(r2.arg, c2), e.pc++;
+        case a$1.STORE:
+          const c = e.stack.pop();
+          e.variables.set(r2.arg, c), e.pc++;
           break;
-        case a.CONCAT:
-          const o = e.stack.pop(), a$1 = e.stack.pop();
-          e.stack.push(a$1 + o), e.pc++;
+        case a$1.CONCAT:
+          const o = e.stack.pop(), a2 = e.stack.pop();
+          e.stack.push(a2 + o), e.pc++;
           break;
-        case a.PRINT:
+        case a$1.PRINT:
           const g2 = e.stack.pop();
           e.output.push(g2), e.pc++;
           break;
-        case a.CC:
+        case a$1.CC:
           e.ccPrompt = e.stack.pop(), e.status = "waiting_cc";
           break;
         default:
@@ -271,7 +271,7 @@ class i {
     };
     return this.execute(e, r2);
   }
-}
+};
 class l {
   constructor(s2) {
     u(this, "vms", /* @__PURE__ */ new Map());
@@ -324,8 +324,8 @@ class l {
       created: /* @__PURE__ */ new Date()
     };
     await this.storage.saveExecution(r2);
-    const c2 = new i();
-    this.vms.set(t2, c2);
+    const c = new i$1();
+    this.vms.set(t2, c);
   }
   /**
    * Get next action from execution (Claude polls this)
@@ -340,13 +340,13 @@ class l {
       if (!e)
         throw new Error(`Program not found: ${t2.programId}`);
       let r2 = this.vms.get(s2);
-      r2 || (r2 = new i(), this.vms.set(s2, r2));
-      const c2 = {
+      r2 || (r2 = new i$1(), this.vms.set(s2, r2));
+      const c = {
         pc: 0,
         stack: [],
         variables: /* @__PURE__ */ new Map(),
         output: []
-      }, o = r2.execute(e.bytecode, c2);
+      }, o = r2.execute(e.bytecode, c);
       if (t2.pc = o.pc, t2.stack = o.stack, t2.variables = Object.fromEntries(o.variables), t2.output = o.output, o.status === "complete")
         return t2.state = "COMPLETED", await this.storage.saveExecution(t2), this.vms.delete(s2), {
           type: "completed",
@@ -390,8 +390,8 @@ class l {
     const r2 = await this.storage.getProgram(e.programId);
     if (!r2)
       throw new Error(`Program not found: ${e.programId}`);
-    let c2 = this.vms.get(s2);
-    c2 || (c2 = new i(), this.vms.set(s2, c2));
+    let c = this.vms.get(s2);
+    c || (c = new i$1(), this.vms.set(s2, c));
     const o = {
       pc: e.pc,
       stack: e.stack,
@@ -399,7 +399,7 @@ class l {
       status: "waiting_cc",
       output: e.output,
       ccPrompt: void 0
-    }, a2 = c2.resume(o, t2, r2.bytecode);
+    }, a2 = c.resume(o, t2, r2.bytecode);
     e.pc = a2.pc, e.stack = a2.stack, e.variables = Object.fromEntries(a2.variables), e.output = a2.output, a2.status === "complete" ? (e.state = "COMPLETED", this.vms.delete(s2)) : a2.status === "error" ? (e.state = "ERROR", e.error = a2.error, this.vms.delete(s2)) : a2.status === "waiting_cc" ? (e.state = "AWAITING_COGNITIVE_RESULT", e.ccPrompt = a2.ccPrompt) : e.state = "RUNNING", await this.storage.saveExecution(e);
   }
   /**
@@ -419,15 +419,15 @@ class l {
     };
   }
 }
-var x = Object.defineProperty;
-var p2 = (i2, r2, t2) => r2 in i2 ? x(i2, r2, { enumerable: true, configurable: true, writable: true, value: t2 }) : i2[r2] = t2;
-var c = (i2, r2, t2) => p2(i2, typeof r2 != "symbol" ? r2 + "" : r2, t2);
-class f {
+var a = Object.defineProperty;
+var i2 = (o, r2, t2) => r2 in o ? a(o, r2, { enumerable: true, configurable: true, writable: true, value: t2 }) : o[r2] = t2;
+var s = (o, r2, t2) => i2(o, typeof r2 != "symbol" ? r2 + "" : r2, t2);
+class h {
   constructor() {
-    c(this, "server");
-    c(this, "transport", null);
-    c(this, "vmManager");
-    this.vmManager = new l(), this.server = new mcp_js.McpServer({
+    s(this, "server");
+    s(this, "transport", null);
+    s(this, "vmManager");
+    console.error("[CVM Debug] Creating CVMMcpServer instance..."), this.vmManager = new l(), this.server = new mcp_js.McpServer({
       name: "cvm-server",
       version: "1.0.0"
     }), this.setupTools();
@@ -439,7 +439,7 @@ class f {
     return "1.0.0";
   }
   setupTools() {
-    this.server.tool(
+    console.error("[CVM Debug] Setting up tools..."), this.server.tool(
       "load",
       {
         programId: zod.z.string(),
@@ -450,9 +450,9 @@ class f {
           return await this.vmManager.loadProgram(r2, t2), {
             content: [{ type: "text", text: `Program loaded successfully: ${r2}` }]
           };
-        } catch (o) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${o instanceof Error ? o.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -468,9 +468,9 @@ class f {
           return await this.vmManager.startExecution(r2, t2), {
             content: [{ type: "text", text: `Execution started: ${t2}` }]
           };
-        } catch (o) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${o instanceof Error ? o.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -512,9 +512,9 @@ class f {
           return await this.vmManager.reportCCResult(r2, t2), {
             content: [{ type: "text", text: "Execution resumed" }]
           };
-        } catch (o) {
+        } catch (e) {
           return {
-            content: [{ type: "text", text: `Error: ${o instanceof Error ? o.message : "Unknown error"}` }],
+            content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : "Unknown error"}` }],
             isError: true
           };
         }
@@ -539,59 +539,18 @@ class f {
       }
     );
   }
-  async start() {
-    await this.vmManager.initialize(), this.transport = new stdio_js.StdioServerTransport(), await this.server.connect(this.transport);
+  async start(r2) {
+    await this.vmManager.initialize(), this.transport = r2 || new stdio_js.StdioServerTransport(), await this.server.connect(this.transport);
   }
   async stop() {
     this.transport && (await this.transport.close(), this.transport = null), await this.vmManager.dispose();
   }
-  // For testing - direct tool invocation
-  async handleTool(r2, t2) {
-    const u2 = {
-      load: async ({ programId: n, source: e }) => {
-        try {
-          return await this.vmManager.loadProgram(n, e), { content: [{ type: "text", text: `Program loaded successfully: ${n}` }] };
-        } catch (s2) {
-          return { content: [{ type: "text", text: s2 instanceof Error ? s2.message : "Unknown error" }], isError: true };
-        }
-      },
-      start: async ({ programId: n, executionId: e }) => {
-        try {
-          return await this.vmManager.startExecution(n, e), { content: [{ type: "text", text: `Execution started: ${e}` }] };
-        } catch (s2) {
-          return { content: [{ type: "text", text: s2 instanceof Error ? s2.message : "Unknown error" }], isError: true };
-        }
-      },
-      getTask: async ({ executionId: n }) => {
-        try {
-          const e = await this.vmManager.getNext(n);
-          return e.type === "completed" ? { content: [{ type: "text", text: "Execution completed" }] } : e.type === "waiting" ? { content: [{ type: "text", text: e.message || "Waiting for input" }] } : { content: [{ type: "text", text: `Error: ${e.error}` }], isError: true };
-        } catch (e) {
-          return { content: [{ type: "text", text: e instanceof Error ? e.message : "Unknown error" }], isError: true };
-        }
-      },
-      submitTask: async ({ executionId: n, result: e }) => {
-        try {
-          return await this.vmManager.reportCCResult(n, e), { content: [{ type: "text", text: "Execution resumed" }] };
-        } catch (s2) {
-          return { content: [{ type: "text", text: s2 instanceof Error ? s2.message : "Unknown error" }], isError: true };
-        }
-      },
-      status: async ({ executionId: n }) => {
-        try {
-          const e = await this.vmManager.getExecutionStatus(n);
-          return { content: [{ type: "text", text: JSON.stringify(e, null, 2) }] };
-        } catch (e) {
-          return { content: [{ type: "text", text: e instanceof Error ? e.message : "Unknown error" }], isError: true };
-        }
-      }
-    }[r2];
-    if (!u2)
-      throw new Error(`Tool not found: ${r2}`);
-    return await u2(t2);
+  // For testing - expose VMManager for direct testing
+  getVMManager() {
+    return this.vmManager;
   }
 }
-dotenv__namespace.config({ path: s.resolve(__dirname, "../../../.env") });
+dotenv__namespace.config({ path: s$1.resolve(__dirname, "../../../.env") });
 function loadConfig() {
   const env = process.env.NODE_ENV || "development";
   const storageType = process.env.CVM_STORAGE_TYPE || "file";
@@ -683,13 +642,13 @@ async function main() {
     });
     if (config.storage.type === "file") {
       const dataDir = config.storage.dataDir || ".cvm";
-      const fullPath = s.resolve(process.cwd(), dataDir);
+      const fullPath = s$1.resolve(process.cwd(), dataDir);
       logger2.info(`[CVM] Initializing file storage in: ${fullPath}`);
       logger2.warn(`[CVM] ⚠️  Remember to add '${dataDir}/' to your .gitignore file!`);
     } else {
       logger2.info("[CVM] Using MongoDB storage");
     }
-    cvmServer = new f();
+    cvmServer = new h();
     await cvmServer.start();
     logger2.info("CVM Server is running and ready to accept MCP connections");
     process.on("SIGINT", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvm-server",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Cognitive Virtual Machine (CVM) - A deterministic bytecode VM with AI cognitive operations",
   "keywords": [
     "mcp",