gm-skill 2.0.1441 → 2.0.1443

package/gm-plugkit/bootstrap.js

@@ -879,13 +879,32 @@ function probeUnsupervisedWatcher(spoolDir) {
   } catch (_) {}
 }
 
+function resolveNodeRuntime() {
+  const isNodeExe = (p) => /(^|[\\/])node(\.exe)?$/i.test(String(p || ''));
+  const candidates = [];
+  if (isNodeExe(process.env.GM_NODE_PATH)) candidates.push(process.env.GM_NODE_PATH);
+  if (isNodeExe(process.execPath)) candidates.push(process.execPath);
+  try {
+    const which = process.platform === 'win32' ? 'where' : 'which';
+    const out = require('child_process').spawnSync(which, ['node'], { encoding: 'utf8', windowsHide: true });
+    if (out && out.stdout) {
+      const first = out.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)[0];
+      if (first) candidates.push(first);
+    }
+  } catch (_) {}
+  for (const c of candidates) {
+    try { const r = require('child_process').spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
+  }
+  return process.execPath;
+}
+
 function startSpoolDaemon() {
   try {
     const wrapper = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
     if (!fs.existsSync(wrapper)) {
       return { ok: false, error: `wrapper not at ${wrapper} — ensureReady() must run first` };
     }
-    const runtime = process.execPath;
+    const runtime = resolveNodeRuntime();
     const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
     const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
     fs.mkdirSync(spoolDir, { recursive: true });
@@ -919,7 +938,7 @@ function startSpoolDaemon() {
 
     const logFd = fs.openSync(logPath, 'a');
     try { fs.writeSync(logFd, `\n--- supervisor spawn ${new Date().toISOString()} parent=${process.pid} ---\n`); } catch (_) {}
-    const child = require('child_process').spawn(process.execPath, [supervisor], {
+    const child = require('child_process').spawn(runtime, [supervisor], {
       detached: true,
       stdio: ['ignore', logFd, logFd],
       windowsHide: true,

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1441",
+  "version": "2.0.1443",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {
@@ -11,6 +11,8 @@
     "cli.js",
     "index.js",
     "bootstrap.js",
+    "supervisor.js",
+    "lang-host-runner.js",
     "plugkit-wasm-wrapper.js",
     "plugkit.version",
     "plugkit.sha256",

package/gm-plugkit/supervisor.js

@@ -94,15 +94,27 @@ function spawnWatcher(bootReason) {
     process.exit(3);
   }
 
-  let runtime = process.env.PLUGKIT_RUNTIME || 'bun';
-  let cmd = runtime;
+  const isNodeExe = (p) => /(^|[\\/])node(\.exe)?$/i.test(String(p || ''));
+  const resolveNode = () => {
+    const candidates = [];
+    if (isNodeExe(process.env.PLUGKIT_RUNTIME)) candidates.push(process.env.PLUGKIT_RUNTIME);
+    if (isNodeExe(process.execPath)) candidates.push(process.execPath);
+    if (process.env.GM_NODE_PATH) candidates.push(process.env.GM_NODE_PATH);
+    try {
+      const which = process.platform === 'win32' ? 'where' : 'which';
+      const out = spawnSync(which, ['node'], { encoding: 'utf8', windowsHide: true });
+      if (out && out.stdout) {
+        const first = out.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)[0];
+        if (first) candidates.push(first);
+      }
+    } catch (_) {}
+    for (const c of candidates) {
+      try { const r = spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
+    }
+    return process.execPath;
+  };
+  let cmd = resolveNode();
   let args = [wrapper, 'spool'];
-  try {
-    spawnSync(runtime, ['--version'], { stdio: 'ignore', windowsHide: true });
-  } catch (_) {
-    cmd = process.execPath;
-    args = [wrapper, 'spool'];
-  }
 
   let logFd = null;
   try { logFd = fs.openSync(LOG_PATH, 'a'); } catch (_) {}

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1441",
+  "version": "2.0.1443",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1441",
+  "version": "2.0.1443",
   "description": "Canonical universal harness — AI-native software engineering via skill-driven orchestration; bootstraps plugkit for task execution and session isolation. Install in any AI coding agent host.",
   "author": "AnEntrypoint",
   "license": "MIT",