gm-plugkit 2.0.1263 → 2.0.1265

package/bootstrap.js

@@ -205,6 +205,7 @@ async function extractNpmPackageWasm(destPath, version) {
 
     const cmd = resolveWindowsExe('npm');
     const args = ['install', '--no-audit', '--no-fund', '--no-save', NPM_PACKAGE + '@' + version];
+    const isCmdShim = process.platform === 'win32' && /\.(cmd|bat)$/i.test(cmd);
 
     const result = spawnSync(cmd, args, {
       cwd: tempDir,
@@ -212,8 +213,7 @@ async function extractNpmPackageWasm(destPath, version) {
       timeout: ATTEMPT_TIMEOUT_MS,
       encoding: 'utf8',
       windowsHide: true,
-      // CREATE_NO_WINDOW — inherited by .cmd shims npm spawns during
-      // package install, so no conhost flash during the extract step.
+      ...(isCmdShim ? { shell: true } : {}),
       ...(process.platform === 'win32' ? { creationFlags: 0x08000000 } : {}),
     });
 
@@ -305,6 +305,10 @@ async function extractNpmPackageWithRetry(destPath, version) {
         log(`npm binary unresolvable (ENOENT); skipping retries, falling back`);
         throw err;
       }
+      if (err && (err.code === 'EINVAL' || /EINVAL/.test(String(err.message || '')))) {
+        log(`spawn EINVAL on npm shim; skipping retries, falling back`);
+        throw err;
+      }
       if (attempt < MAX_ATTEMPTS) {
         const wait = BACKOFF_MS[attempt - 1] || 120000;
         log(`backing off ${wait}ms`);

package/package.json

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

@@ -299,6 +299,8 @@ function readCurrentSess() {
   return __sessCache.value;
 }
 
+const __lockRejectedEmitAt = new Map();
+
 function logEvent(sub, event, fields) {
   if (process.env.GM_LOG_DISABLE) return;
   try {
@@ -1462,7 +1464,14 @@ async function runSpoolWatcher(instance, spoolDir) {
             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 (_) {}
+            try {
+              const __now = Date.now();
+              const __last = __lockRejectedEmitAt.get(pidStr) || 0;
+              if (__now - __last > 60000) {
+                __lockRejectedEmitAt.set(pidStr, __now);
+                logEvent('plugkit', 'watcher.lock-rejected', { severity: 'info', holder_pid: pidStr, lock_age_ms: age });
+              }
+            } catch (_) {}
             process.exit(75);
           }
         } else {