gm-skill 2.0.1515 → 2.0.1517

package/AGENTS.md

@@ -30,6 +30,8 @@ The plugkit stack runs as a wasm cdylib loaded by `plugkit-wasm-wrapper.js` unde
 
 **Every wasm host-import `extern "C"` block carries `#[link(wasm_import_module = "env")]`.** The host provides every possible host fn (host_kv_get/put/query, host_vec_search, host_git, host_log, host_now_ms, host_fs_*, host_env_get, host_exec_js, host_random_fill, …) under the `env` import module (`plugkit-wasm-wrapper.js` `importObject.env`). A bare `extern "C"` block links only because lenient linkers tolerate the unresolved module; the strict Linux release `rust-lld` in CI errors `undefined symbol: host_*` and Build-WASM fails. This holds in rs-plugkit AND every dep crate linked into the cdylib (rs-learn) AND any sibling that builds wasm (rs-exec, rs-search). The trap: `cargo check` and even `cargo build --release` on a non-Linux host both pass while CI fails — the linker differs by host, so the only reproduction is a Linux release link; the CI job log is admin-gated, so Build-WASM echoes `::error::` annotations to surface the lld error publicly. Add a host import anywhere and the block carries the attribute or the cascade goes dark. Full incident in rs-learn (`recall: cascade outage wasm import module link`).
 
+**`plugkit-wasm-wrapper.js` is ESM; never use inline `require()` for a node builtin — import it at module scope.** The wrapper runs under both node and bun, and the supervisor's `resolveRuntime()` prefers bun. Under bun's ESM, `require` is not a global, so an inline `const x = require('crypto'|'net'|'http'|'https'|'child_process')` throws `require is not defined` — and because those calls sit in `catch(_){}` blocks, the failure is silent: it broke `_ownWrapperSha12` (status.wrapper_sha stayed null, leaving the supervisor wrapper-sha-drift recycle inert), `_wrapperShaAtBoot` and its self-drift-restart, the synthetic-session cwd-hash, and the file-index sha — all only under the bun watcher, which is why it hid for so long (node-run watchers have `require` via CJS interop). Every node builtin is imported once at the top (`import crypto from 'crypto'`, etc.); inline `require` of a builtin is forbidden. Full incident in rs-learn (`recall: wrapper require not defined under bun`).
+
 ## Spool dispatch ABI
 
 Agents dispatch verbs by writing to `.gm/exec-spool/in/<verb>/<N>.txt` (request body) and reading the response from `.gm/exec-spool/out/<verb>-<N>.json` (nested verbs) or `.gm/exec-spool/out/<N>.json` (root verbs). The wasm orchestrator services every possible verb; the harness never executes side effects directly.

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1515",
+  "version": "2.0.1517",
   "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": {

package/gm-plugkit/plugkit-wasm-wrapper.js

@@ -3,9 +3,14 @@ import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
 import https from 'https';
+import http from 'http';
 import { watch } from 'fs';
+import * as _childProcess from 'child_process';
 import { spawn as _rawSpawn, spawnSync as _rawSpawnSync } from 'child_process';
 import net from 'net';
+const _netModule = net;
+const _httpModule = http;
+const _httpsModule = https;
 import { fileURLToPath } from 'url';
 
 // Set by the spool watcher's writeStatus closure once it is live. Lets long synchronous verbs
@@ -437,7 +442,7 @@ function readCurrentSess() {
   let resolved = found || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
   if (!resolved) {
     if (!__sessCache.syntheticSess) {
-      const cwdHash = require('crypto').createHash('sha1').update(process.cwd()).digest('hex').slice(0, 8);
+      const cwdHash = crypto.createHash('sha1').update(process.cwd()).digest('hex').slice(0, 8);
       __sessCache.syntheticSess = `cwd-${cwdHash}-pid${process.pid}`;
     }
     resolved = __sessCache.syntheticSess;
@@ -488,7 +493,7 @@ function autoRecordBrowserEditsFromBody(body, cwd, taskBase, verb) {
     try { st = fs.statSync(abs); } catch (_) { continue; }
     if (!st.isFile()) continue;
     let hash = '';
-    try { hash = require('crypto').createHash('sha256').update(fs.readFileSync(abs)).digest('hex').slice(0, 12); } catch (_) {}
+    try { hash = crypto.createHash('sha256').update(fs.readFileSync(abs)).digest('hex').slice(0, 12); } catch (_) {}
     const idx = list.findIndex(e => e && e.file === rel);
     const entry = { file: rel, ts: Date.now(), hash, source_verb: verb, source_task: taskBase };
     if (idx === -1) { list.push(entry); added++; } else { list[idx] = entry; }
@@ -823,7 +828,7 @@ function resolveWindowsExeLocal(cmd) {
 
 function isPortReachableSync(host, port, timeoutMs) {
   const r = spawnSync(process.execPath, ['-e', `
-    const net = require('net');
+    const net = _netModule;
     const s = net.connect({ port: ${port}, host: ${JSON.stringify(host)} });
     let done = false;
     s.on('connect', () => { done = true; s.destroy(); process.exit(0); });
@@ -835,7 +840,7 @@ function isPortReachableSync(host, port, timeoutMs) {
 
 function findFreePortSync() {
   const r = spawnSync(process.execPath, ['-e', `
-    const net = require('net');
+    const net = _netModule;
     const srv = net.createServer();
     srv.listen(0, '127.0.0.1', () => { const p = srv.address().port; srv.close(() => { process.stdout.write(String(p)); }); });
     srv.on('error', e => { process.stderr.write(e.message); process.exit(1); });
@@ -846,7 +851,7 @@ function findFreePortSync() {
 
 function isPortAliveSync(port) {
   const r = spawnSync(process.execPath, ['-e', `
-    const net = require('net');
+    const net = _netModule;
     const s = net.connect({ port: ${port}, host: '127.0.0.1' });
     s.on('connect', () => { s.destroy(); process.exit(0); });
     s.on('error', () => process.exit(1));
@@ -944,7 +949,7 @@ function findInstalledChromiumBinary() {
 
 function fetchJsonSync(url, timeoutMs) {
   const r = spawnSync(process.execPath, ['-e', `
-    const http = require('http');
+    const http = _httpModule;
     const req = http.get(${JSON.stringify(url)}, (res) => {
       let buf = '';
       res.on('data', d => buf += d);
@@ -1052,7 +1057,7 @@ function gracefulCloseBrowser(entry, reason) {
       const info = fetchJsonSync(`http://127.0.0.1:${port}/json/version`, 600);
       if (info && info.webSocketDebuggerUrl) {
         spawnSync(process.execPath, ['-e', `
-          const http = require('http');
+          const http = _httpModule;
           const req = http.request({host:'127.0.0.1',port:${port},path:'/json/close/browser',method:'GET',timeout:1500},
             res => { res.resume(); res.on('end', () => process.exit(0)); });
           req.on('error', () => process.exit(1));
@@ -2083,10 +2088,8 @@ async function runSpoolWatcher(instance, spoolDir) {
 
   const LOCK_PATH = path.join(spoolDir, '.watcher.lock');
   try {
-    const _crypto = require('crypto');
     const _wp = path.join(GM_TOOLS_ROOT, 'plugkit-wasm-wrapper.js');
-    _ownWrapperSha12 = _crypto.createHash('sha256').update(fs.readFileSync(_wp)).digest('hex').slice(0, 12);
-    try { logEvent('plugkit', 'watcher.own-wrapper-sha', { sha: _ownWrapperSha12, wrapper_path: _wp }); } catch (_) {}
+    _ownWrapperSha12 = crypto.createHash('sha256').update(fs.readFileSync(_wp)).digest('hex').slice(0, 12);
   } catch (e) {
     try { logEvent('plugkit', 'watcher.own-wrapper-sha-failed', { error: String(e && e.message || e), gm_tools_root: GM_TOOLS_ROOT }); } catch (_) {}
   }
@@ -2350,7 +2353,7 @@ async function runSpoolWatcher(instance, spoolDir) {
         try { own = JSON.parse(fs.readFileSync(ownPkgJsonFile, 'utf-8')).version; } catch (_) {}
       }
       if (!own) return;
-      const https = require('https');
+      const https = _httpsModule;
       let _probeErrored = false;
       const req = https.get('https://registry.npmjs.org/gm-plugkit/latest', { timeout: 10000, headers: { 'user-agent': 'plugkit-watcher' } }, (res) => {
         let body = '';
@@ -2384,7 +2387,7 @@ async function runSpoolWatcher(instance, spoolDir) {
               try { logEvent('plugkit', 'gm-plugkit.self-stale', { running_version: own, latest_version: latest, detected_by: 'watcher-periodic-probe' }); } catch (_) {}
               console.error(`[plugkit-wasm] gm-plugkit self-stale: running ${own}, latest npm ${latest} -> spawning replacement via bun x gm-plugkit@latest spool and exiting`);
               try {
-                const cp = require('child_process');
+                const cp = _childProcess;
                 const bunPath = process.env.GM_BUN_PATH || 'bun';
                 const child = cp.spawn(bunPath, ['x', `gm-plugkit@${latest}`, 'spool'], {
                   cwd: process.cwd(),
@@ -2475,7 +2478,7 @@ async function runSpoolWatcher(instance, spoolDir) {
         console.error(`[plugkit-wasm] version drift detected: instance=${instV} file=${fileV} — spawning replacement via bun x gm-plugkit@latest spool, waiting for its heartbeat before exiting`);
         let spawnOk = false;
         try {
-          const cp = require('child_process');
+          const cp = _childProcess;
           const bunPath = process.env.GM_BUN_PATH || 'bun';
           const child = cp.spawn(bunPath, ['x', 'gm-plugkit@latest', 'spool'], {
             cwd: process.cwd(),
@@ -2550,15 +2553,13 @@ async function runSpoolWatcher(instance, spoolDir) {
   const _wrapperPathInstalled = path.join(GM_TOOLS_ROOT, 'plugkit-wasm-wrapper.js');
   let _wrapperShaAtBoot = '';
   try {
-    const _crypto = require('crypto');
-    _wrapperShaAtBoot = _crypto.createHash('sha256').update(fs.readFileSync(_wrapperPathInstalled)).digest('hex');
+    _wrapperShaAtBoot = crypto.createHash('sha256').update(fs.readFileSync(_wrapperPathInstalled)).digest('hex');
   } catch (_) {}
   let _wrapperDriftLoggedOnce = false;
   setInterval(() => {
     try {
       if (!_wrapperShaAtBoot) return;
-      const _crypto = require('crypto');
-      const cur = _crypto.createHash('sha256').update(fs.readFileSync(_wrapperPathInstalled)).digest('hex');
+      const cur = crypto.createHash('sha256').update(fs.readFileSync(_wrapperPathInstalled)).digest('hex');
       if (cur === _wrapperShaAtBoot) return;
       const bootReason = process.env.PLUGKIT_BOOT_REASON || 'unknown';
       const unsupervised = bootReason === 'direct-no-supervisor';
@@ -2573,7 +2574,7 @@ async function runSpoolWatcher(instance, spoolDir) {
         });
         console.error(`[plugkit-wasm] wrapper.js drift detected — spawning replacement directly from installed wrapper then exiting`);
         try {
-          const cp = require('child_process');
+          const cp = _childProcess;
           const child = cp.spawn(process.execPath, [_wrapperPathInstalled, 'spool'], {
             cwd: process.cwd(),
             detached: true,
@@ -2585,7 +2586,7 @@ async function runSpoolWatcher(instance, spoolDir) {
         } catch (e) {
           console.error(`[plugkit-wasm] direct node spawn failed: ${e.message}; falling back to bun x`);
           try {
-            const cp = require('child_process');
+            const cp = _childProcess;
             const bunPath = process.env.GM_BUN_PATH || 'bun';
             const child = cp.spawn(bunPath, ['x', 'gm-plugkit@latest', 'spool'], {
               cwd: process.cwd(),

package/gm-plugkit/supervisor.js

@@ -23,6 +23,7 @@ fs.mkdirSync(spoolDir, { recursive: true });
 const STATUS_PATH = path.join(spoolDir, '.status.json');
 const SHUTDOWN_REASON_PATH = path.join(spoolDir, '.shutdown-reason.json');
 const SUPERVISOR_PATH = path.join(spoolDir, '.supervisor.json');
+const SUPERVISOR_PID_PATH = path.join(spoolDir, '.supervisor.pid');
 const LOG_PATH = path.join(spoolDir, '.watcher.log');
 const GM_LOG_ROOT = process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log');
 
@@ -66,6 +67,36 @@ function pidAlive(pid) {
   try { process.kill(pid, 0); return true; } catch (_) { return false; }
 }
 
+// Single-instance guard. findSupervisorPid (skill-bootstrap.js) reads .supervisor.pid to early-return
+// when a supervisor is already running; without it every bootstrap spawns a duplicate supervisor,
+// and duplicates spawn duplicate watchers that lock-fight in an endless spawn-reject churn. Write the
+// pid file on startup and refuse to start if a live peer already holds it.
+function acquireSingleInstance() {
+  try {
+    if (fs.existsSync(SUPERVISOR_PID_PATH)) {
+      const other = parseInt(fs.readFileSync(SUPERVISOR_PID_PATH, 'utf-8').trim(), 10);
+      if (Number.isFinite(other) && other !== process.pid && pidAlive(other)) {
+        logEvent('supervisor.refused-duplicate', { existing_pid: other, severity: 'warn' });
+        return false;
+      }
+    }
+    fs.writeFileSync(SUPERVISOR_PID_PATH, String(process.pid));
+    return true;
+  } catch (e) {
+    logEvent('supervisor.pid-write-failed', { error: e.message, severity: 'warn' });
+    return true;
+  }
+}
+
+function releaseSingleInstance() {
+  try {
+    if (fs.existsSync(SUPERVISOR_PID_PATH)) {
+      const raw = fs.readFileSync(SUPERVISOR_PID_PATH, 'utf-8').trim();
+      if (parseInt(raw, 10) === process.pid) fs.unlinkSync(SUPERVISOR_PID_PATH);
+    }
+  } catch (_) {}
+}
+
 function readStatus() {
   try { return JSON.parse(fs.readFileSync(STATUS_PATH, 'utf-8')); } catch (_) { return null; }
 }
@@ -273,9 +304,15 @@ process.on('SIGTERM', () => {
   if (currentChildPid && pidAlive(currentChildPid)) {
     try { process.kill(currentChildPid, 'SIGTERM'); } catch (_) {}
   }
+  releaseSingleInstance();
   process.exit(0);
 });
+process.on('exit', () => { releaseSingleInstance(); });
 
+if (!acquireSingleInstance()) {
+  process.stderr.write('[plugkit-supervisor] another supervisor is alive; exiting\n');
+  process.exit(0);
+}
 writeSupervisorStatus('starting', {});
 logEvent('supervisor.starting', { spool_dir: spoolDir });
 try { fs.unlinkSync(path.join(spoolDir, '.pre-supervised-watcher.json')); } catch (_) {}

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1515",
+  "version": "2.0.1517",
   "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.1515",
+  "version": "2.0.1517",
   "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",