gm-plugkit 2.0.1177 → 2.0.1179

package/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/package.json

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

@@ -1008,6 +1008,15 @@ async function runSpoolWatcher(instance, spoolDir) {
           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 {
+              fs.writeFileSync(path.join(spoolDir, '.shutdown-reason.json'), JSON.stringify({
+                reason: 'peer-stale-takeover',
+                ts: Date.now(),
+                taker_pid: process.pid,
+                taker_sha: _ownWrapperSha12,
+                holder_sha: holderSha,
+              }));
+            } catch (_) {}
             try { process.kill(parseInt(pidStr, 10), 'SIGTERM'); } catch (_) {}
           } else {
             const msg = JSON.stringify({ ok: false, reason: 'another-watcher-active', pid: pidStr, age_ms: age });
@@ -1073,6 +1082,15 @@ async function runSpoolWatcher(instance, spoolDir) {
       } 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 {
+        fs.writeFileSync(path.join(peerCwd, '.gm', 'exec-spool', '.shutdown-reason.json'), JSON.stringify({
+          reason: 'peer-stale-takeover',
+          ts: Date.now(),
+          killer_pid: process.pid,
+          killer_sha: _ownWrapperSha12,
+          peer_sha: peerSha,
+        }));
+      } catch (_) {}
       try { process.kill(peerPid, 'SIGTERM'); } catch (_) {}
     }
   }