gm-plugkit 2.0.1159 → 2.0.1161

package/bootstrap.js

@@ -153,6 +153,23 @@ function sha256OfFile(filePath) {
   });
 }
 
+function resolveNpxJsCli() {
+  if (process.platform !== 'win32') return null;
+  const candidates = [];
+  if (process.env.npm_config_prefix) {
+    candidates.push(path.join(process.env.npm_config_prefix, 'node_modules', 'npm', 'bin', 'npx-cli.js'));
+  }
+  const programFiles = process.env.ProgramFiles || 'C:\\Program Files';
+  candidates.push(path.join(programFiles, 'nodejs', 'node_modules', 'npm', 'bin', 'npx-cli.js'));
+  candidates.push(path.join(path.dirname(process.execPath), 'node_modules', 'npm', 'bin', 'npx-cli.js'));
+  const appdata = process.env.APPDATA;
+  if (appdata) candidates.push(path.join(appdata, 'npm', 'node_modules', 'npm', 'bin', 'npx-cli.js'));
+  for (const c of candidates) {
+    try { if (fs.existsSync(c)) return c; } catch (_) {}
+  }
+  return null;
+}
+
 async function extractNpmPackageWasm(destPath, version) {
   const tempDir = path.join(path.dirname(destPath), '.npm-extract-' + Date.now());
   try {
@@ -161,16 +178,28 @@ async function extractNpmPackageWasm(destPath, version) {
     log(`extracting npm package ${NPM_PACKAGE}@${version} to ${tempDir}`);
     obsEvent('bootstrap', 'npm.extract.start', { package: NPM_PACKAGE, version });
 
-    const result = spawnSync(
-      process.platform === 'win32' ? 'npx.cmd' : 'npx',
-      [NPM_PACKAGE + '@' + version, '--prefix', tempDir],
-      {
-        stdio: ['ignore', 'pipe', 'pipe'],
-        timeout: ATTEMPT_TIMEOUT_MS,
-        encoding: 'utf8',
-        windowsHide: true,
+    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];
+    }
+
+    const result = spawnSync(cmd, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout: ATTEMPT_TIMEOUT_MS,
+      encoding: 'utf8',
+      windowsHide: true,
+      shell: process.platform === 'win32' && cmd === 'npx.cmd',
+    });
 
     if (result.error) throw result.error;
     if (result.status !== 0) {
@@ -192,25 +221,37 @@ async function extractNpmPackageWasm(destPath, version) {
 
 function httpGetBuffer(url, timeoutMs) {
   const https = require('https');
+  const idleTimeoutMs = timeoutMs || 30000;
+  const totalDeadlineMs = (timeoutMs || 30000) * 2;
   return new Promise((resolve, reject) => {
-    const req = https.get(url, { timeout: timeoutMs || 30000, headers: { 'user-agent': 'gm-plugkit-bootstrap' } }, (res) => {
+    let bytesReceived = 0;
+    let settled = false;
+    const settleReject = (err) => { if (!settled) { settled = true; reject(err); } };
+    const settleResolve = (v) => { if (!settled) { settled = true; resolve(v); } };
+    const absTimer = setTimeout(() => {
+      try { req.destroy(new Error(`abs-deadline ${totalDeadlineMs}ms ${url} after ${bytesReceived} bytes`)); } catch (_) {}
+      settleReject(new Error(`abs-deadline ${totalDeadlineMs}ms ${url} after ${bytesReceived} bytes`));
+    }, totalDeadlineMs);
+    const req = https.get(url, { timeout: idleTimeoutMs, headers: { 'user-agent': 'gm-plugkit-bootstrap' } }, (res) => {
       if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
         res.resume();
-        httpGetBuffer(res.headers.location, timeoutMs).then(resolve, reject);
+        clearTimeout(absTimer);
+        httpGetBuffer(res.headers.location, timeoutMs).then(settleResolve, settleReject);
         return;
       }
       if (res.statusCode !== 200) {
         res.resume();
-        reject(new Error(`HTTP ${res.statusCode} ${url}`));
+        clearTimeout(absTimer);
+        settleReject(new Error(`HTTP ${res.statusCode} ${url}`));
         return;
       }
       const chunks = [];
-      res.on('data', c => chunks.push(c));
-      res.on('end', () => resolve(Buffer.concat(chunks)));
-      res.on('error', reject);
+      res.on('data', c => { chunks.push(c); bytesReceived += c.length; });
+      res.on('end', () => { clearTimeout(absTimer); settleResolve(Buffer.concat(chunks)); });
+      res.on('error', (e) => { clearTimeout(absTimer); settleReject(e); });
     });
-    req.on('timeout', () => req.destroy(new Error(`timeout ${url}`)));
-    req.on('error', reject);
+    req.on('timeout', () => { try { req.destroy(new Error(`idle-timeout ${idleTimeoutMs}ms ${url}`)); } catch (_) {} settleReject(new Error(`idle-timeout ${idleTimeoutMs}ms ${url}`)); });
+    req.on('error', (e) => { clearTimeout(absTimer); settleReject(e); });
   });
 }
 

package/package.json

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

@@ -932,6 +932,22 @@ function resolveVersion(instance) {
   return 'unknown';
 }
 
+function readFileVersionOnly() {
+  try { return fs.readFileSync(path.join(os.homedir(), '.claude', 'gm-tools', 'plugkit.version'), 'utf8').trim(); } catch (_) { return null; }
+}
+
+function readInstanceVersion(instance) {
+  try {
+    const fn = instance && instance.exports && instance.exports.plugkit_version;
+    if (typeof fn !== 'function') return null;
+    const result = fn();
+    const ptr = Number(result & 0xffffffffn);
+    const len = Number(result >> 32n);
+    const bytes = new Uint8Array(instance.exports.memory.buffer, ptr, len);
+    return new TextDecoder().decode(bytes).trim();
+  } catch (_) { return null; }
+}
+
 async function runSpoolWatcher(instance, spoolDir) {
   const inDir = path.join(spoolDir, 'in');
   const outDir = path.join(spoolDir, 'out');
@@ -947,8 +963,11 @@ async function runSpoolWatcher(instance, spoolDir) {
         const lockTs = parseInt(tsStr, 10);
         const age = Date.now() - lockTs;
         if (age < 15000) {
-          console.error(`[plugkit-wasm] another watcher active (pid=${pidStr}, age=${age}ms); refusing to start`);
-          process.exit(1);
+          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);
         }
         console.error(`[plugkit-wasm] stale lock (age=${age}ms); taking over`);
       }
@@ -1035,6 +1054,35 @@ async function runSpoolWatcher(instance, spoolDir) {
     try { reapTimedOutTasks(); } catch (_) {}
   }, 5000);
 
+  const _instanceVersionAtBoot = readInstanceVersion(instance);
+  setInterval(() => {
+    try {
+      const fileV = readFileVersionOnly();
+      const instV = _instanceVersionAtBoot;
+      if (!fileV || !instV || fileV === instV) return;
+      logEvent('plugkit', 'version.drift', {
+        instance_version: instV,
+        file_version: fileV,
+        action: 'exit-for-respawn',
+      });
+      console.error(`[plugkit-wasm] version drift detected: instance=${instV} file=${fileV} → exiting so supervisor reloads fresh wasm`);
+      try {
+        fs.writeFileSync(path.join(spoolDir, '.shutdown-reason.json'), JSON.stringify({
+          reason: 'version-change',
+          ts: Date.now(),
+          pid: process.pid,
+          instance_version: instV,
+          file_version: fileV,
+        }));
+      } catch (_) {}
+      try { releaseLock(); } catch (_) {}
+      try { fs.unlinkSync(STATUS_PATH_FOR_TEARDOWN); } catch (_) {}
+      process.exit(0);
+    } catch (e) {
+      console.error(`[version-drift-check] error: ${e.message}`);
+    }
+  }, 60_000);
+
   setInterval(() => {
     try {
       const idleMs = Date.now() - lastActivityMs;

package/plugkit.sha256

@@ -1 +1 @@
-{"plugkit.wasm":"ffb68924055bffd275db6a174fb5d286c1fcaf5a135f968345bf221b9976544f"}
+{"plugkit.wasm":"623152434c8b0f75b20cb89f48551e3a1677f132275e0fc43e261db7a69afeed"}

package/plugkit.version

@@ -1 +1 @@
-0.1.418
+0.1.419