agentic-numerical-control 0.1.8 → 0.2.0

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "agentic-numerical-control",
-  "version": "0.1.8",
-  "description": "Agentic Numerical Control: see and run CNC jobs from your AI assistant. A 3D toolpath viewer, live machine status and job control for CNCjs/GRBL machines.",
+  "version": "0.2.0",
+  "description": "Agentic Numerical Control: see and run CNC jobs from your AI assistant. A 3D toolpath viewer, live machine status and job control for GRBL machines, with a built-in CNCjs engine.",
   "scripts": {
-    "build": "tsc --noEmit -p tsconfig.app.json && cross-env INPUT=viewer.html vite build && cross-env INPUT=jobs.html vite build && cross-env INPUT=machine.html vite build && cross-env INPUT=setup.html vite build && tsc -p tsconfig.build.json",
+    "build": "node engines/cncjs/build.mjs && node engines/kiri/build.mjs && tsc --noEmit -p tsconfig.app.json && cross-env INPUT=viewer.html vite build && cross-env INPUT=jobs.html vite build && cross-env INPUT=machine.html vite build && cross-env INPUT=setup.html vite build && tsc -p tsconfig.build.json",
     "dev": "npm run build && tsx server/cli.ts start",
     "dev:serve": "npm run build && tsx server/cli.ts serve",
     "dev:stdio": "npm run build 1>&2 && tsx server/cli.ts stdio",
     "sim:build": "node sim/build.mjs",
     "sim:e2e": "node sim/e2e.mjs",
     "prepack": "npm run build",
-    "demo:site": "tsx scripts/build-demo.ts && tsx scripts/build-catalogue.ts"
+    "demo:site": "tsx scripts/build-demo.ts && tsx scripts/build-catalogue.ts",
+    "engines:check": "node engines/update.mjs",
+    "cam:check": "node engines/kiri/check.mjs"
   },
   "license": "MIT",
   "dependencies": {
@@ -18,11 +20,12 @@
     "@modelcontextprotocol/ext-apps": "^2.0.3",
     "@modelcontextprotocol/node": "^2.0.0",
     "@modelcontextprotocol/server": "^2.0.0",
-    "cncjs": "^1.11.5",
+    "@serialport/parser-readline": "10.5.0",
     "cors": "^2.8.6",
     "express": "^5.3.0",
     "gcode-toolpath": "^3.0.0",
     "jsonwebtoken": "^9.0.3",
+    "serialport": "10.5.0",
     "socket.io-client": "^2.2.0",
     "three": "^0.186.1",
     "ws": "^8.22.0",
@@ -36,6 +39,7 @@
     "@types/three": "^0.186.0",
     "@types/ws": "^8.18.2",
     "cross-env": "^10.1.0",
+    "esbuild": "0.25.10",
     "tsx": "^4.23.15",
     "typescript": "^5.9.3",
     "vite": "^6.4.4",

package/product.json

@@ -1,8 +1,8 @@
-{
-  "name": "agentic-numerical-control",
-  "displayName": "Agentic Numerical Control",
-  "shortName": "anc",
-  "dirName": "AgenticNumericalControl",
-  "cloudUrl": "https://api.agenticnumericalcontrol.com",
-  "siteUrl": "https://agenticnumericalcontrol.com"
-}
+{
+  "name": "agentic-numerical-control",
+  "displayName": "Agentic Numerical Control",
+  "shortName": "anc",
+  "dirName": "AgenticNumericalControl",
+  "cloudUrl": "https://api.agenticnumericalcontrol.com",
+  "siteUrl": "https://agenticnumericalcontrol.com"
+}

package/samples/demo-pocket-profile.nc

@@ -1,130 +1,130 @@
-(Agentic Numerical Control demo: pocket, profile, drill)
-G21 G90 G17 G54
-M3 S12000
-G0 Z5
-G0 X-20.000 Y-12.000
-G1 Z-1.500 F300
-G1 Y-12.000 F1200
-G1 X20.000
-G1 Y-9.000 F1200
-G1 X-20.000
-G1 Y-6.000 F1200
-G1 X20.000
-G1 Y-3.000 F1200
-G1 X-20.000
-G1 Y0.000 F1200
-G1 X20.000
-G1 Y3.000 F1200
-G1 X-20.000
-G1 Y6.000 F1200
-G1 X20.000
-G1 Y9.000 F1200
-G1 X-20.000
-G1 Y12.000 F1200
-G1 X20.000
-G0 Z5
-G0 X-20.000 Y-12.000
-G1 Z-3.000 F300
-G1 Y-12.000 F1200
-G1 X20.000
-G1 Y-9.000 F1200
-G1 X-20.000
-G1 Y-6.000 F1200
-G1 X20.000
-G1 Y-3.000 F1200
-G1 X-20.000
-G1 Y0.000 F1200
-G1 X20.000
-G1 Y3.000 F1200
-G1 X-20.000
-G1 Y6.000 F1200
-G1 X20.000
-G1 Y9.000 F1200
-G1 X-20.000
-G1 Y12.000 F1200
-G1 X20.000
-G0 Z5
-G0 X-29.000 Y-25.000
-G1 Z-2.000 F300
-G1 X29.000 F1000
-G3 X35.000 Y-19.000 I0 J6.000
-G1 Y19.000
-G3 X29.000 Y25.000 I-6.000 J0
-G1 X-29.000
-G3 X-35.000 Y19.000 I0 J-6.000
-G1 Y-19.000
-G3 X-29.000 Y-25.000 I6.000 J0
-G0 Z5
-G0 X-29.000 Y-25.000
-G1 Z-4.000 F300
-G1 X29.000 F1000
-G3 X35.000 Y-19.000 I0 J6.000
-G1 Y19.000
-G3 X29.000 Y25.000 I-6.000 J0
-G1 X-29.000
-G3 X-35.000 Y19.000 I0 J-6.000
-G1 Y-19.000
-G3 X-29.000 Y-25.000 I6.000 J0
-G0 Z5
-G0 X-29.000 Y-25.000
-G1 Z-6.000 F300
-G1 X29.000 F1000
-G3 X35.000 Y-19.000 I0 J6.000
-G1 Y19.000
-G3 X29.000 Y25.000 I-6.000 J0
-G1 X-29.000
-G3 X-35.000 Y19.000 I0 J-6.000
-G1 Y-19.000
-G3 X-29.000 Y-25.000 I6.000 J0
-G0 Z5
-G0 X-28.000 Y-18.000
-G1 Z-2.000 F200
-G0 Z1
-G1 Z-4.000 F200
-G0 Z1
-G1 Z-6.000 F200
-G0 Z1
-G1 Z-8.000 F200
-G0 Z1
-G0 Z5
-G0 X28.000 Y-18.000
-G1 Z-2.000 F200
-G0 Z1
-G1 Z-4.000 F200
-G0 Z1
-G1 Z-6.000 F200
-G0 Z1
-G1 Z-8.000 F200
-G0 Z1
-G0 Z5
-G0 X28.000 Y18.000
-G1 Z-2.000 F200
-G0 Z1
-G1 Z-4.000 F200
-G0 Z1
-G1 Z-6.000 F200
-G0 Z1
-G1 Z-8.000 F200
-G0 Z1
-G0 Z5
-G0 X-28.000 Y18.000
-G1 Z-2.000 F200
-G0 Z1
-G1 Z-4.000 F200
-G0 Z1
-G1 Z-6.000 F200
-G0 Z1
-G1 Z-8.000 F200
-G0 Z1
-G0 Z5
-G0 X4 Y0
-G1 Z0 F300
-G2 X4 Y0 Z-1.500 I-4 J0 F600
-G2 X4 Y0 Z-3.000 I-4 J0 F600
-G2 X4 Y0 Z-4.500 I-4 J0 F600
-G2 X4 Y0 Z-6.000 I-4 J0 F600
-G2 X4 Y0 I-4 J0
-G0 Z5
-M5
-G0 X0 Y0
-M30
+(Agentic Numerical Control demo: pocket, profile, drill)
+G21 G90 G17 G54
+M3 S12000
+G0 Z5
+G0 X-20.000 Y-12.000
+G1 Z-1.500 F300
+G1 Y-12.000 F1200
+G1 X20.000
+G1 Y-9.000 F1200
+G1 X-20.000
+G1 Y-6.000 F1200
+G1 X20.000
+G1 Y-3.000 F1200
+G1 X-20.000
+G1 Y0.000 F1200
+G1 X20.000
+G1 Y3.000 F1200
+G1 X-20.000
+G1 Y6.000 F1200
+G1 X20.000
+G1 Y9.000 F1200
+G1 X-20.000
+G1 Y12.000 F1200
+G1 X20.000
+G0 Z5
+G0 X-20.000 Y-12.000
+G1 Z-3.000 F300
+G1 Y-12.000 F1200
+G1 X20.000
+G1 Y-9.000 F1200
+G1 X-20.000
+G1 Y-6.000 F1200
+G1 X20.000
+G1 Y-3.000 F1200
+G1 X-20.000
+G1 Y0.000 F1200
+G1 X20.000
+G1 Y3.000 F1200
+G1 X-20.000
+G1 Y6.000 F1200
+G1 X20.000
+G1 Y9.000 F1200
+G1 X-20.000
+G1 Y12.000 F1200
+G1 X20.000
+G0 Z5
+G0 X-29.000 Y-25.000
+G1 Z-2.000 F300
+G1 X29.000 F1000
+G3 X35.000 Y-19.000 I0 J6.000
+G1 Y19.000
+G3 X29.000 Y25.000 I-6.000 J0
+G1 X-29.000
+G3 X-35.000 Y19.000 I0 J-6.000
+G1 Y-19.000
+G3 X-29.000 Y-25.000 I6.000 J0
+G0 Z5
+G0 X-29.000 Y-25.000
+G1 Z-4.000 F300
+G1 X29.000 F1000
+G3 X35.000 Y-19.000 I0 J6.000
+G1 Y19.000
+G3 X29.000 Y25.000 I-6.000 J0
+G1 X-29.000
+G3 X-35.000 Y19.000 I0 J-6.000
+G1 Y-19.000
+G3 X-29.000 Y-25.000 I6.000 J0
+G0 Z5
+G0 X-29.000 Y-25.000
+G1 Z-6.000 F300
+G1 X29.000 F1000
+G3 X35.000 Y-19.000 I0 J6.000
+G1 Y19.000
+G3 X29.000 Y25.000 I-6.000 J0
+G1 X-29.000
+G3 X-35.000 Y19.000 I0 J-6.000
+G1 Y-19.000
+G3 X-29.000 Y-25.000 I6.000 J0
+G0 Z5
+G0 X-28.000 Y-18.000
+G1 Z-2.000 F200
+G0 Z1
+G1 Z-4.000 F200
+G0 Z1
+G1 Z-6.000 F200
+G0 Z1
+G1 Z-8.000 F200
+G0 Z1
+G0 Z5
+G0 X28.000 Y-18.000
+G1 Z-2.000 F200
+G0 Z1
+G1 Z-4.000 F200
+G0 Z1
+G1 Z-6.000 F200
+G0 Z1
+G1 Z-8.000 F200
+G0 Z1
+G0 Z5
+G0 X28.000 Y18.000
+G1 Z-2.000 F200
+G0 Z1
+G1 Z-4.000 F200
+G0 Z1
+G1 Z-6.000 F200
+G0 Z1
+G1 Z-8.000 F200
+G0 Z1
+G0 Z5
+G0 X-28.000 Y18.000
+G1 Z-2.000 F200
+G0 Z1
+G1 Z-4.000 F200
+G0 Z1
+G1 Z-6.000 F200
+G0 Z1
+G1 Z-8.000 F200
+G0 Z1
+G0 Z5
+G0 X4 Y0
+G1 Z0 F300
+G2 X4 Y0 Z-1.500 I-4 J0 F600
+G2 X4 Y0 Z-3.000 I-4 J0 F600
+G2 X4 Y0 Z-4.500 I-4 J0 F600
+G2 X4 Y0 Z-6.000 I-4 J0 F600
+G2 X4 Y0 I-4 J0
+G0 Z5
+M5
+G0 X0 Y0
+M30

package/sim/virtual-port.cjs

@@ -1,134 +1,134 @@
-// Preloaded into CNCjs (`node --require sim/virtual-port.cjs`) to add a
-// "GRBL-SIM" serial port backed by the grblHAL simulator (sim/build-sim.sh) over stdio. Real serial ports keep
-// working unchanged. No virtual COM driver is needed.
-
-const { spawn } = require("node:child_process");
-const fs = require("node:fs");
-const path = require("node:path");
-const Module = require("node:module");
-// Resolved from the serialport package so it is the same copy CNCjs uses.
-const { SerialPortStream } = require(require.resolve("@serialport/stream", { paths: [path.dirname(require.resolve("serialport"))] }));
-
-const SIM_PATH = "GRBL-SIM";
-const SIM_BIN = path.join(__dirname, ".build", "grbl_sim");
-// Set GRBL_SIM_LOG to a file path to record the serial traffic (for debugging).
-const SIM_LOG = process.env.GRBL_SIM_LOG;
-const trace = (dir, data) => {
-  if (SIM_LOG) fs.appendFileSync(SIM_LOG, `${new Date().toISOString()} ${dir} ${JSON.stringify(data.toString())}
-`);
-};
-
-/** The simulator is a Linux/macOS program; on Windows it runs inside WSL. */
-function simCommand() {
-  // -n: plain Grbl replies (no comment prefix); step/block traces discarded.
-  const args = ["-n", "-s", "/dev/null", "-b", "/dev/null"];
-  if (process.platform !== "win32") return [SIM_BIN, args];
-  const wslPath = SIM_BIN.replace(/^([A-Za-z]):/, (_, d) => `/mnt/${d.toLowerCase()}`).replace(/\\/g, "/");
-  return ["wsl.exe", ["--", wslPath, ...args]];
-}
-
-class CanceledError extends Error {
-  constructor(message) {
-    super(message);
-    this.canceled = true;
-  }
-}
-
-class SimPortBinding {
-  constructor(openOptions) {
-    this.openOptions = openOptions;
-    this.isOpen = true;
-    this.data = Buffer.alloc(0);
-    this.pendingRead = null;
-    const [cmd, args] = simCommand();
-    // cwd: the simulator keeps its EEPROM.DAT (Grbl settings) there.
-    this.child = spawn(cmd, args, { cwd: path.dirname(SIM_BIN), stdio: ["pipe", "pipe", "inherit"], windowsHide: true });
-    this.child.stdout.on("data", (chunk) => {
-      trace("<<", chunk);
-      this.data = Buffer.concat([this.data, chunk]);
-      const wake = this.pendingRead;
-      this.pendingRead = null;
-      if (wake) wake();
-    });
-    this.child.on("exit", (code, signal) => {
-      trace("--", `simulator exited (${code ?? signal})`);
-      this.isOpen = false;
-      const wake = this.pendingRead;
-      this.pendingRead = null;
-      if (wake) wake(new CanceledError("simulator exited"));
-    });
-  }
-
-  async close() {
-    this.isOpen = false;
-    this.child.kill();
-    const wake = this.pendingRead;
-    this.pendingRead = null;
-    if (wake) wake(new CanceledError("port is closed"));
-  }
-
-  async read(buffer, offset, length) {
-    if (!this.isOpen) throw new CanceledError("Read canceled");
-    if (this.data.length === 0) {
-      await new Promise((resolve, reject) => {
-        this.pendingRead = (err) => (err ? reject(err) : resolve());
-      });
-    }
-    const bytesRead = this.data.copy(buffer, offset, 0, Math.min(length, this.data.length));
-    this.data = this.data.subarray(bytesRead);
-    return { bytesRead, buffer };
-  }
-
-  async write(buffer) {
-    if (!this.isOpen) throw new Error("Port is not open");
-    trace(">>", buffer);
-    await new Promise((resolve, reject) => this.child.stdin.write(buffer, (err) => (err ? reject(err) : resolve())));
-  }
-
-  async update(options) {
-    this.openOptions.baudRate = options.baudRate;
-  }
-  async set() {}
-  async get() {
-    return { cts: true, dsr: true, dcd: true };
-  }
-  async getBaudRate() {
-    return { baudRate: this.openOptions.baudRate };
-  }
-  async flush() {
-    this.data = Buffer.alloc(0);
-  }
-  async drain() {}
-}
-
-function withSimPort(serialport) {
-  const real = serialport.SerialPort.binding;
-  const binding = {
-    async list() {
-      const ports = await real.list();
-      if (fs.existsSync(SIM_BIN)) ports.push({ path: SIM_PATH, manufacturer: "grblHAL simulator (Agentic Numerical Control)" });
-      return ports;
-    },
-    async open(options) {
-      if (options.path === SIM_PATH) return new SimPortBinding({ ...options });
-      return real.open(options);
-    },
-  };
-  class SerialPort extends SerialPortStream {
-    constructor(options, openCallback) {
-      super({ binding, ...options }, openCallback);
-    }
-  }
-  SerialPort.list = binding.list;
-  SerialPort.binding = binding;
-  return { ...serialport, SerialPort };
-}
-
-let patched = null;
-const load = Module._load;
-Module._load = function (request, parent, isMain) {
-  const mod = load.call(this, request, parent, isMain);
-  if (request !== "serialport") return mod;
-  patched ??= withSimPort(mod);
-  return patched;
-};
+// Preloaded into CNCjs (`node --require sim/virtual-port.cjs`) to add a
+// "GRBL-SIM" serial port backed by the grblHAL simulator (sim/build-sim.sh) over stdio. Real serial ports keep
+// working unchanged. No virtual COM driver is needed.
+
+const { spawn } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+const Module = require("node:module");
+// Resolved from the serialport package so it is the same copy CNCjs uses.
+const { SerialPortStream } = require(require.resolve("@serialport/stream", { paths: [path.dirname(require.resolve("serialport"))] }));
+
+const SIM_PATH = "GRBL-SIM";
+const SIM_BIN = path.join(__dirname, ".build", "grbl_sim");
+// Set GRBL_SIM_LOG to a file path to record the serial traffic (for debugging).
+const SIM_LOG = process.env.GRBL_SIM_LOG;
+const trace = (dir, data) => {
+  if (SIM_LOG) fs.appendFileSync(SIM_LOG, `${new Date().toISOString()} ${dir} ${JSON.stringify(data.toString())}
+`);
+};
+
+/** The simulator is a Linux/macOS program; on Windows it runs inside WSL. */
+function simCommand() {
+  // -n: plain Grbl replies (no comment prefix); step/block traces discarded.
+  const args = ["-n", "-s", "/dev/null", "-b", "/dev/null"];
+  if (process.platform !== "win32") return [SIM_BIN, args];
+  const wslPath = SIM_BIN.replace(/^([A-Za-z]):/, (_, d) => `/mnt/${d.toLowerCase()}`).replace(/\\/g, "/");
+  return ["wsl.exe", ["--", wslPath, ...args]];
+}
+
+class CanceledError extends Error {
+  constructor(message) {
+    super(message);
+    this.canceled = true;
+  }
+}
+
+class SimPortBinding {
+  constructor(openOptions) {
+    this.openOptions = openOptions;
+    this.isOpen = true;
+    this.data = Buffer.alloc(0);
+    this.pendingRead = null;
+    const [cmd, args] = simCommand();
+    // cwd: the simulator keeps its EEPROM.DAT (Grbl settings) there.
+    this.child = spawn(cmd, args, { cwd: path.dirname(SIM_BIN), stdio: ["pipe", "pipe", "inherit"], windowsHide: true });
+    this.child.stdout.on("data", (chunk) => {
+      trace("<<", chunk);
+      this.data = Buffer.concat([this.data, chunk]);
+      const wake = this.pendingRead;
+      this.pendingRead = null;
+      if (wake) wake();
+    });
+    this.child.on("exit", (code, signal) => {
+      trace("--", `simulator exited (${code ?? signal})`);
+      this.isOpen = false;
+      const wake = this.pendingRead;
+      this.pendingRead = null;
+      if (wake) wake(new CanceledError("simulator exited"));
+    });
+  }
+
+  async close() {
+    this.isOpen = false;
+    this.child.kill();
+    const wake = this.pendingRead;
+    this.pendingRead = null;
+    if (wake) wake(new CanceledError("port is closed"));
+  }
+
+  async read(buffer, offset, length) {
+    if (!this.isOpen) throw new CanceledError("Read canceled");
+    if (this.data.length === 0) {
+      await new Promise((resolve, reject) => {
+        this.pendingRead = (err) => (err ? reject(err) : resolve());
+      });
+    }
+    const bytesRead = this.data.copy(buffer, offset, 0, Math.min(length, this.data.length));
+    this.data = this.data.subarray(bytesRead);
+    return { bytesRead, buffer };
+  }
+
+  async write(buffer) {
+    if (!this.isOpen) throw new Error("Port is not open");
+    trace(">>", buffer);
+    await new Promise((resolve, reject) => this.child.stdin.write(buffer, (err) => (err ? reject(err) : resolve())));
+  }
+
+  async update(options) {
+    this.openOptions.baudRate = options.baudRate;
+  }
+  async set() {}
+  async get() {
+    return { cts: true, dsr: true, dcd: true };
+  }
+  async getBaudRate() {
+    return { baudRate: this.openOptions.baudRate };
+  }
+  async flush() {
+    this.data = Buffer.alloc(0);
+  }
+  async drain() {}
+}
+
+function withSimPort(serialport) {
+  const real = serialport.SerialPort.binding;
+  const binding = {
+    async list() {
+      const ports = await real.list();
+      if (fs.existsSync(SIM_BIN)) ports.push({ path: SIM_PATH, manufacturer: "grblHAL simulator (Agentic Numerical Control)" });
+      return ports;
+    },
+    async open(options) {
+      if (options.path === SIM_PATH) return new SimPortBinding({ ...options });
+      return real.open(options);
+    },
+  };
+  class SerialPort extends SerialPortStream {
+    constructor(options, openCallback) {
+      super({ binding, ...options }, openCallback);
+    }
+  }
+  SerialPort.list = binding.list;
+  SerialPort.binding = binding;
+  return { ...serialport, SerialPort };
+}
+
+let patched = null;
+const load = Module._load;
+Module._load = function (request, parent, isMain) {
+  const mod = load.call(this, request, parent, isMain);
+  if (request !== "serialport") return mod;
+  patched ??= withSimPort(mod);
+  return patched;
+};