gm-plugkit 2.0.1544 → 2.0.1545

package/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: gm-skill
-description: Plugkit-served instruction stream. Three-layer admission (cost, bounds, direction) over every possible mutation. Closure on first emit; partial = non-monotonic.
+description: Plugkit-served instruction stream. Three-layer admission (witness, single-writer, direction) over every possible mutation; effort unbounded, never gated on cost. Closure on first emit; partial = non-monotonic.
 allowed-tools: Skill, Read, Write, Bash(bun *), Bash(npx *)
 ---
 

package/bootstrap.js

@@ -716,7 +716,8 @@ function ensureSkillMdFresh() {
     }
     const bundled = fs.readFileSync(bundledPath, 'utf-8');
     const crypto = require('crypto');
-    const bundledHash = crypto.createHash('sha256').update(bundled).digest('hex');
+    const _norm = s => s.replace(/\r\n/g, '\n');
+    const bundledHash = crypto.createHash('sha256').update(_norm(bundled)).digest('hex');
     const home = process.env.HOME || process.env.USERPROFILE || require('os').homedir();
     const targets = [
       path.join(home, '.agents', 'skills', 'gm-skill', 'SKILL.md'),
@@ -728,7 +729,7 @@ function ensureSkillMdFresh() {
         let needsWrite = true;
         if (fs.existsSync(target)) {
           const existing = fs.readFileSync(target, 'utf-8');
-          const existingHash = crypto.createHash('sha256').update(existing).digest('hex');
+          const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
           if (existingHash === bundledHash) needsWrite = false;
         }
         if (needsWrite) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1544",
+  "version": "2.0.1545",
   "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/plugkit-wasm-wrapper.js

@@ -2560,6 +2560,17 @@ async function runSpoolWatcher(instance, spoolDir) {
   setTimeout(probeGmPlugkitSelfStale, 5000);
   setInterval(probeGmPlugkitSelfStale, 300_000);
 
+  // A supervised watcher self-exits on drift assuming the supervisor respawns it. If the
+  // supervisor has died, that bare exit leaves the spool dead (worse than staying up). Treat a
+  // dead/absent supervisor as unsupervised so the drift loops take the self-respawn-and-wait path
+  // (spawn replacement, wait for its heartbeat, then exit) instead. False-negative is self-correcting:
+  // if both the supervisor and this watcher respawn, the single-instance lock admits exactly one.
+  function _supervisorIsDead() {
+    try {
+      const sp = parseInt(fs.readFileSync(path.join(spoolDir, '.supervisor.pid'), 'utf8').trim(), 10);
+      return !(Number.isFinite(sp) && isProcessAliveSync(sp));
+    } catch (_) { return true; }
+  }
   const _instanceVersionAtBoot = readInstanceVersion(instance);
   let _driftLoggedOnce = false;
   setInterval(() => {
@@ -2568,7 +2579,7 @@ async function runSpoolWatcher(instance, spoolDir) {
       const instV = _instanceVersionAtBoot;
       if (!fileV || !instV || fileV === instV) return;
       const bootReason = process.env.PLUGKIT_BOOT_REASON || 'unknown';
-      const unsupervised = bootReason === 'direct-no-supervisor';
+      const unsupervised = bootReason === 'direct-no-supervisor' || _supervisorIsDead();
       if (unsupervised) {
         if (_driftLoggedOnce) return;
         _driftLoggedOnce = true;
@@ -2665,7 +2676,7 @@ async function runSpoolWatcher(instance, spoolDir) {
       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';
+      const unsupervised = bootReason === 'direct-no-supervisor' || _supervisorIsDead();
       if (unsupervised) {
         if (_wrapperDriftLoggedOnce) return;
         _wrapperDriftLoggedOnce = true;