gm-plugkit 2.0.1990 → 2.0.1992

package/cli.js

@@ -6,24 +6,12 @@ const os = require('os');
 const path = require('path');
 const cp = require('child_process');
 const { ensureReady, startSpoolDaemon, gmToolsDir, readVersionFile, ensureGmPlugkitVersionFresh, ensureSkillMdFresh, ensureWrapperFresh, isReady, getWasmPath, readPinnedGmPlugkitVersion, spawnPinnedBoot, resolveProjectRoot } = require('./bootstrap');
+const { pidAliveSync, waitForPidDeath } = require('./gm-process');
 
 function getWasmPathSafe() {
   try { return getWasmPath(); } catch (_) { return null; }
 }
 
-function pidAliveSync(pid) {
-  try { process.kill(pid, 0); return true; } catch (_) { return false; }
-}
-
-function waitForPidDeath(pid, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (!pidAliveSync(pid)) return true;
-    try { cp.execFileSync(process.platform === 'win32' ? 'ping' : 'sleep', process.platform === 'win32' ? ['-n', '2', '127.0.0.1'] : ['0.3'], { stdio: 'ignore', windowsHide: true }); } catch (_) {}
-  }
-  return !pidAliveSync(pid);
-}
-
 function spawnBackgroundFreshnessCheck(reason) {
   try {
     const child = cp.spawn(process.execPath, [__filename.replace(/cli\.js$/, 'bootstrap.js')], {

package/gm-process.js

@@ -13,4 +13,22 @@ function pidCommandLineForKillGuard(pid) {
   } catch (_) { return ''; }
 }
 
-module.exports = { pidCommandLineForKillGuard };
+// Is `pid` still alive? signal-0 probe (throws ESRCH once the process is gone).
+function pidAliveSync(pid) {
+  try { process.kill(pid, 0); return true; } catch (_) { return false; }
+}
+
+// Block (via a short spawnSync sleep, no async) until `pid` dies or timeoutMs
+// elapses. Shared by cli.js (daemon recycle) and supervisor.js (killChild) —
+// both previously carried a byte-divergent inline copy (execFileSync vs
+// spawnSync) of this exact loop.
+function waitForPidDeath(pid, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (!pidAliveSync(pid)) return true;
+    try { spawnSync(process.platform === 'win32' ? 'ping' : 'sleep', process.platform === 'win32' ? ['-n', '2', '127.0.0.1'] : ['0.3'], { stdio: 'ignore', windowsHide: true }); } catch (_) {}
+  }
+  return !pidAliveSync(pid);
+}
+
+module.exports = { pidCommandLineForKillGuard, pidAliveSync, waitForPidDeath };

package/package.json

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

@@ -1 +1 @@
-0.1.915
+0.1.916

package/supervisor.js

@@ -8,7 +8,7 @@ const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
 const { gmToolsDir, resolveProjectRoot } = require('./bootstrap');
 const { logEvent: _sharedLogEvent, GM_LOG_ROOT: _sharedGmLogRoot } = require('./gm-log');
-const { pidCommandLineForKillGuard: _sharedPidCommandLine } = require('./gm-process');
+const { pidCommandLineForKillGuard: _sharedPidCommandLine, pidAliveSync, waitForPidDeath } = require('./gm-process');
 
 function wrapperSha12OnDisk() {
   try {
@@ -149,19 +149,6 @@ function readShutdownReason() {
 // deliberate upgrade recycle as a SILENT ABORT / unplanned-restart critical. Write
 // the planned reason on the child's behalf BEFORE killing, so the next boot reads a
 // fresh planned shutdown reason and classifies the restart correctly.
-function pidAliveSync(pid) {
-  try { process.kill(pid, 0); return true; } catch (_) { return false; }
-}
-
-function waitForPidDeath(pid, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (!pidAliveSync(pid)) return true;
-    try { spawnSync(process.platform === 'win32' ? 'ping' : 'sleep', process.platform === 'win32' ? ['-n', '2', '127.0.0.1'] : ['0.3'], { stdio: 'ignore', windowsHide: true }); } catch (_) {}
-  }
-  return !pidAliveSync(pid);
-}
-
 function killChild(reason) {
   if (!currentChildPid) return;
   const pid = currentChildPid;