gm-plugkit 2.0.1512 → 2.0.1514

package/package.json

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

@@ -12,6 +12,13 @@ import { fileURLToPath } from 'url';
 // (browser/chromium spawn, long exec) stamp a busy_until window into .status.json before the
 // blocking call, so a liveness probe reads "busy" not "dead" while the event loop is blocked.
 let _writeStatusBusy = () => {};
+// Latest busy_until epoch ms stamped by a long synchronous verb (codesearch rebuild, chromium
+// spawn). scanStalledTurns reads it so a busy watcher is not mis-flagged as an idle stall.
+let _lastBusyUntil = 0;
+// First 12 hex of sha256 of this watcher's own gmTools wrapper. Module-scoped so writeStatus
+// (a different function scope) can stamp status.wrapper_sha, which the supervisor compares
+// against the on-disk wrapper to recycle a watcher running a stale wrapper-only fix.
+let _ownWrapperSha12 = '';
 
 function spawnSync(cmd, args, opts) {
   return _rawSpawnSync(cmd, args, { windowsHide: true, ...(opts || {}) });
@@ -373,6 +380,10 @@ function turnTick(sess, verb, taskBase, phase, prdPending) {
 const STALL_MS = 300_000;
 function scanStalledTurns() {
   const now = Date.now();
+  // A long synchronous verb (codesearch index rebuild, chromium spawn) stamps busy_until and
+  // blocks the spool — the agent is legitimately waiting, not stalled. Honor it exactly as
+  // supervisor.js checkWatcherHealth does, so a busy watcher never emits a false mid-chain-stall.
+  if (_lastBusyUntil && _lastBusyUntil > now) return;
   for (const [key, t] of _turns) {
     if (!t || typeof t !== 'object' || !Number.isFinite(t.startTs)) continue;
     if (t.stallEmitted) continue;
@@ -2071,7 +2082,6 @@ async function runSpoolWatcher(instance, spoolDir) {
 
 
   const LOCK_PATH = path.join(spoolDir, '.watcher.lock');
-  let _ownWrapperSha12 = '';
   try {
     const _crypto = require('crypto');
     const _wp = path.join(GM_TOOLS_ROOT, 'plugkit-wasm-wrapper.js');
@@ -3095,7 +3105,7 @@ async function runSpoolWatcher(instance, spoolDir) {
       // busy_until tells probes "alive but synchronously busy until this epoch ms" — read it
       // alongside ts: a stale ts whose busy_until is still in the future is a busy watcher, not
       // a dead one. The pre-verb writeStatus(busyMs) stamps it before the blocking call.
-      if (busyMs && busyMs > 0) rec.busy_until = now + busyMs;
+      if (busyMs && busyMs > 0) { rec.busy_until = now + busyMs; _lastBusyUntil = rec.busy_until; }
       fs.writeFileSync(STATUS_PATH, JSON.stringify(rec));
     } catch (_) {}
   }

package/supervisor.js

@@ -4,8 +4,18 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
 
+function wrapperSha12OnDisk() {
+  try {
+    const primary = path.join(os.homedir(), '.gm-tools', 'plugkit-wasm-wrapper.js');
+    const fallback = path.join(os.homedir(), '.claude', 'gm-tools', 'plugkit-wasm-wrapper.js');
+    const wp = fs.existsSync(primary) ? primary : fallback;
+    return crypto.createHash('sha256').update(fs.readFileSync(wp)).digest('hex').slice(0, 12);
+  } catch (_) { return null; }
+}
+
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
 const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
 fs.mkdirSync(spoolDir, { recursive: true });
@@ -227,6 +237,25 @@ function checkWatcherHealth() {
     if (process.platform === 'win32') {
       try { spawnSync('taskkill', ['/F', '/T', '/PID', String(currentChildPid)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
     }
+    return;
+  }
+  // A published wrapper-only fix (no wasm version bump) lands in ~/.gm-tools via the next
+  // bootstrap's ensureWrapperFresh, but a healthy running watcher keeps the old wrapper until it
+  // restarts. On wrapper_sha drift (watcher's reported sha != on-disk), recycle so the fix goes
+  // live without a manual kill. busy_until already returned above, so the watcher is not mid-verb.
+  const reported = status.wrapper_sha || null;
+  const onDisk = wrapperSha12OnDisk();
+  if (reported && onDisk && reported !== onDisk) {
+    logEvent('supervisor.wrapper-sha-drift', {
+      watcher_pid: currentChildPid,
+      reported_sha: reported,
+      on_disk_sha: onDisk,
+      severity: 'info',
+    });
+    try { process.kill(currentChildPid, 'SIGTERM'); } catch (_) {}
+    if (process.platform === 'win32') {
+      try { spawnSync('taskkill', ['/F', '/T', '/PID', String(currentChildPid)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
+    }
   }
 }