gm-plugkit 2.0.1175 → 2.0.1177

package/package.json

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

@@ -987,30 +987,47 @@ async function runSpoolWatcher(instance, spoolDir) {
   fs.mkdirSync(outDir, { recursive: true });
 
   const LOCK_PATH = path.join(spoolDir, '.watcher.lock');
+  let _ownWrapperSha12 = '';
+  try {
+    const _crypto = require('crypto');
+    const _wp = path.join(os.homedir(), '.claude', 'gm-tools', 'plugkit-wasm-wrapper.js');
+    _ownWrapperSha12 = _crypto.createHash('sha256').update(fs.readFileSync(_wp)).digest('hex').slice(0, 12);
+  } catch (_) {}
+  function lockBody() { return `${process.pid}|${Date.now()}|${_ownWrapperSha12}`; }
   function acquireLock() {
     try {
       if (fs.existsSync(LOCK_PATH)) {
         const content = fs.readFileSync(LOCK_PATH, 'utf-8').trim();
-        const [pidStr, tsStr] = content.split('|');
+        const parts = content.split('|');
+        const pidStr = parts[0];
+        const tsStr = parts[1];
+        const holderSha = parts[2] || '';
         const lockTs = parseInt(tsStr, 10);
         const age = Date.now() - lockTs;
         if (age < 15000) {
-          const msg = JSON.stringify({ ok: false, reason: 'another-watcher-active', pid: pidStr, age_ms: age });
-          console.error(`[plugkit-wasm] ${msg}; refusing to start`);
-          try { fs.writeFileSync(path.join(spoolDir, '.lock-rejection.json'), msg); } catch (_) {}
-          try { logEvent('plugkit', 'watcher.lock-rejected', { holder_pid: pidStr, lock_age_ms: age }); } catch (_) {}
-          process.exit(75);
+          if (_ownWrapperSha12 && holderSha && holderSha !== _ownWrapperSha12) {
+            try { logEvent('plugkit', 'peer.stale-wrapper-takeover', { holder_pid: pidStr, holder_sha: holderSha, own_sha: _ownWrapperSha12, lock_age_ms: age }); } catch (_) {}
+            console.error(`[plugkit-wasm] peer wrapper-sha mismatch (holder=${holderSha} own=${_ownWrapperSha12}); killing pid=${pidStr} and taking over`);
+            try { process.kill(parseInt(pidStr, 10), 'SIGTERM'); } catch (_) {}
+          } else {
+            const msg = JSON.stringify({ ok: false, reason: 'another-watcher-active', pid: pidStr, age_ms: age });
+            console.error(`[plugkit-wasm] ${msg}; refusing to start`);
+            try { fs.writeFileSync(path.join(spoolDir, '.lock-rejection.json'), msg); } catch (_) {}
+            try { logEvent('plugkit', 'watcher.lock-rejected', { holder_pid: pidStr, lock_age_ms: age }); } catch (_) {}
+            process.exit(75);
+          }
+        } else {
+          console.error(`[plugkit-wasm] stale lock (age=${age}ms); taking over`);
         }
-        console.error(`[plugkit-wasm] stale lock (age=${age}ms); taking over`);
       }
-      fs.writeFileSync(LOCK_PATH, `${process.pid}|${Date.now()}`);
+      fs.writeFileSync(LOCK_PATH, lockBody());
     } catch (e) {
       console.error(`[plugkit-wasm] lock acquire failed: ${e.message}`);
       process.exit(1);
     }
   }
   function refreshLock() {
-    try { fs.writeFileSync(LOCK_PATH, `${process.pid}|${Date.now()}`); } catch (_) {}
+    try { fs.writeFileSync(LOCK_PATH, lockBody()); } catch (_) {}
   }
   function releaseLock() {
     try {
@@ -1022,6 +1039,46 @@ async function runSpoolWatcher(instance, spoolDir) {
   acquireLock();
   setInterval(refreshLock, 5000);
 
+  const PEER_REGISTRY_PATH = path.join(os.homedir(), '.claude', 'gm-tools', 'peer-registry.json');
+  function registerSelfAsPeer() {
+    try {
+      let reg = {};
+      try { reg = JSON.parse(fs.readFileSync(PEER_REGISTRY_PATH, 'utf-8')); } catch (_) {}
+      reg[process.cwd()] = { pid: process.pid, ts: Date.now(), sha: _ownWrapperSha12 };
+      fs.writeFileSync(PEER_REGISTRY_PATH, JSON.stringify(reg, null, 2));
+    } catch (_) {}
+  }
+  registerSelfAsPeer();
+  setInterval(registerSelfAsPeer, 30_000);
+
+  function sweepStalePeers() {
+    if (!_ownWrapperSha12) return;
+    let reg = {};
+    try { reg = JSON.parse(fs.readFileSync(PEER_REGISTRY_PATH, 'utf-8')); } catch (_) { return; }
+    for (const peerCwd of Object.keys(reg)) {
+      if (peerCwd === process.cwd()) continue;
+      const peerLock = path.join(peerCwd, '.gm', 'exec-spool', '.watcher.lock');
+      let content = '';
+      try { content = fs.readFileSync(peerLock, 'utf-8').trim(); } catch (_) { continue; }
+      const parts = content.split('|');
+      const peerPid = parseInt(parts[0], 10);
+      const peerTs = parseInt(parts[1], 10);
+      const peerSha = parts[2] || '';
+      if (!peerPid || !peerSha) continue;
+      const age = Date.now() - peerTs;
+      if (age > 15000) continue;
+      if (peerSha === _ownWrapperSha12) continue;
+      try {
+        process.kill(peerPid, 0);
+      } catch (_) { continue; }
+      logEvent('plugkit', 'peer.stale-wrapper-killed', { peer_cwd: peerCwd, peer_pid: peerPid, peer_sha: peerSha, own_sha: _ownWrapperSha12, lock_age_ms: age });
+      console.error(`[plugkit-wasm] peer-sweep killing stale-wrapper watcher pid=${peerPid} cwd=${peerCwd} sha=${peerSha} (own=${_ownWrapperSha12})`);
+      try { process.kill(peerPid, 'SIGTERM'); } catch (_) {}
+    }
+  }
+  setInterval(sweepStalePeers, 60_000);
+  setTimeout(sweepStalePeers, 5000);
+
   const IDLE_LIMIT_MS = parseInt(process.env.PLUGKIT_IDLE_LIMIT_MS, 10) || 15 * 60 * 1000;
   const IDLE_CHECK_MS = 60_000;
   const SHUTDOWN_REASON_PATH = path.join(spoolDir, '.shutdown-reason.json');