gm-skill 2.0.1513 → 2.0.1515

package/bin/plugkit-supervisor.js

@@ -5,6 +5,13 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { spawn, spawnSync } = require('child_process');
+const crypto = require('crypto');
+
+function wrapperSha12OnDisk() {
+  try {
+    return crypto.createHash('sha256').update(fs.readFileSync(resolveWrapper())).digest('hex').slice(0, 12);
+  } catch (_) { return null; }
+}
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
 const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
@@ -248,6 +255,25 @@ function checkWatcherHealth() {
       severity: 'critical',
     });
     killChild('supervisor-killed-stale-heartbeat');
+    return;
+  }
+  // A published wrapper-only fix (no wasm version bump) is copied to ~/.gm-tools by the next
+  // bootstrap's ensureWrapperFresh, but a healthy running watcher keeps the old wrapper until it
+  // restarts. Compare the watcher's reported wrapper_sha against the on-disk wrapper; on drift,
+  // recycle so the fix goes live without a manual kill. Skip while busy (a long verb is running).
+  const status = readStatus();
+  if (status && !(status.busy_until && status.busy_until > Date.now())) {
+    const reported = status.wrapper_sha || null;
+    const onDisk = wrapperSha12OnDisk();
+    if (reported && onDisk && reported !== onDisk) {
+      logEvent('supervisor.wrapper-sha-drift', {
+        watcher_pid: currentChildPid,
+        reported_sha: reported,
+        on_disk_sha: onDisk,
+        severity: 'info',
+      });
+      killChild('supervisor-killed-wrapper-sha-drift');
+    }
   }
 }
 

package/gm-plugkit/package.json

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

@@ -15,6 +15,10 @@ let _writeStatusBusy = () => {};
 // Latest busy_until epoch ms stamped by a long synchronous verb (codesearch rebuild, chromium
 // spawn). scanStalledTurns reads it so a busy watcher is not mis-flagged as an idle stall.
 let _lastBusyUntil = 0;
+// First 12 hex of sha256 of this watcher's own gmTools wrapper. Module-scoped so writeStatus
+// (a different function scope) can stamp status.wrapper_sha, which the supervisor compares
+// against the on-disk wrapper to recycle a watcher running a stale wrapper-only fix.
+let _ownWrapperSha12 = '';
 
 function spawnSync(cmd, args, opts) {
   return _rawSpawnSync(cmd, args, { windowsHide: true, ...(opts || {}) });
@@ -2078,12 +2082,14 @@ async function runSpoolWatcher(instance, spoolDir) {
 
 
   const LOCK_PATH = path.join(spoolDir, '.watcher.lock');
-  let _ownWrapperSha12 = '';
   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);
-  } catch (_) {}
+    try { logEvent('plugkit', 'watcher.own-wrapper-sha', { sha: _ownWrapperSha12, wrapper_path: _wp }); } catch (_) {}
+  } catch (e) {
+    try { logEvent('plugkit', 'watcher.own-wrapper-sha-failed', { error: String(e && e.message || e), gm_tools_root: GM_TOOLS_ROOT }); } catch (_) {}
+  }
   function lockBody() { return `${process.pid}|${Date.now()}|${_ownWrapperSha12}`; }
   function acquireLock() {
     try {

package/gm-plugkit/supervisor.js

@@ -4,8 +4,18 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
 
+function wrapperSha12OnDisk() {
+  try {
+    const primary = path.join(os.homedir(), '.gm-tools', 'plugkit-wasm-wrapper.js');
+    const fallback = path.join(os.homedir(), '.claude', 'gm-tools', 'plugkit-wasm-wrapper.js');
+    const wp = fs.existsSync(primary) ? primary : fallback;
+    return crypto.createHash('sha256').update(fs.readFileSync(wp)).digest('hex').slice(0, 12);
+  } catch (_) { return null; }
+}
+
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
 const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
 fs.mkdirSync(spoolDir, { recursive: true });
@@ -227,6 +237,25 @@ function checkWatcherHealth() {
     if (process.platform === 'win32') {
       try { spawnSync('taskkill', ['/F', '/T', '/PID', String(currentChildPid)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
     }
+    return;
+  }
+  // A published wrapper-only fix (no wasm version bump) lands in ~/.gm-tools via the next
+  // bootstrap's ensureWrapperFresh, but a healthy running watcher keeps the old wrapper until it
+  // restarts. On wrapper_sha drift (watcher's reported sha != on-disk), recycle so the fix goes
+  // live without a manual kill. busy_until already returned above, so the watcher is not mid-verb.
+  const reported = status.wrapper_sha || null;
+  const onDisk = wrapperSha12OnDisk();
+  if (reported && onDisk && reported !== onDisk) {
+    logEvent('supervisor.wrapper-sha-drift', {
+      watcher_pid: currentChildPid,
+      reported_sha: reported,
+      on_disk_sha: onDisk,
+      severity: 'info',
+    });
+    try { process.kill(currentChildPid, 'SIGTERM'); } catch (_) {}
+    if (process.platform === 'win32') {
+      try { spawnSync('taskkill', ['/F', '/T', '/PID', String(currentChildPid)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
+    }
   }
 }
 

package/gm.json

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