gm-skill 2.0.1176 → 2.0.1178

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1176` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1178` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
 
 ## Source of truth
 

package/gm-plugkit/bootstrap.js

@@ -178,27 +178,18 @@ async function extractNpmPackageWasm(destPath, version) {
     log(`extracting npm package ${NPM_PACKAGE}@${version} to ${tempDir}`);
     obsEvent('bootstrap', 'npm.extract.start', { package: NPM_PACKAGE, version });
 
-    let cmd, args;
-    if (process.platform === 'win32') {
-      const npxCli = resolveNpxJsCli();
-      if (npxCli) {
-        cmd = process.execPath;
-        args = [npxCli, NPM_PACKAGE + '@' + version, '--prefix', tempDir];
-      } else {
-        cmd = 'npx.cmd';
-        args = [NPM_PACKAGE + '@' + version, '--prefix', tempDir];
-      }
-    } else {
-      cmd = 'npx';
-      args = [NPM_PACKAGE + '@' + version, '--prefix', tempDir];
-    }
+    fs.writeFileSync(path.join(tempDir, 'package.json'), JSON.stringify({ name: 'plugkit-extract', version: '0.0.0', private: true }));
+
+    const cmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    const args = ['install', '--no-audit', '--no-fund', '--no-save', NPM_PACKAGE + '@' + version];
 
     const result = spawnSync(cmd, args, {
+      cwd: tempDir,
       stdio: ['ignore', 'pipe', 'pipe'],
       timeout: ATTEMPT_TIMEOUT_MS,
       encoding: 'utf8',
       windowsHide: true,
-      shell: process.platform === 'win32' && cmd === 'npx.cmd',
+      shell: process.platform === 'win32',
     });
 
     if (result.error) throw result.error;

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

@@ -1039,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');

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1176",
+  "version": "2.0.1178",
   "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.1176",
+  "version": "2.0.1178",
   "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",
@@ -39,7 +39,7 @@
     "gm.json"
   ],
   "dependencies": {
-    "gm-plugkit": "^2.0.1176"
+    "gm-plugkit": "^2.0.1178"
   },
   "engines": {
     "node": ">=16.0.0"