gm-skill 2.0.2023 → 2.0.2025

package/README.md

@@ -60,7 +60,7 @@ gm/
 |-- skills/gm/        <- the skill (SKILL.md), installed as /gm
 |-- bin/               <- bootstrap + installer + plugkit wasm pins (gmsniff / ccsniff are separate npm packages, `bun x gmsniff`, `bun x ccsniff`)
 |-- scripts/           <- publish-time helper scripts
-|-- gm-plugkit/        <- separate npm package that ships the wasm-wrapper + supervisor
+|-- gm-plugkit/        <- separate npm package: thin launcher + bootstrap that delegates to the native agentplug-runner, with the JS wasm-wrapper kept only as a fallback host
 |-- gm.json            <- version + plugkit pin
 |-- package.json       <- npm publish manifest
 |-- AGENTS.md          <- architectural rules (present-tense, no history)

package/bin/plugkit-slim.wasm.sha256

@@ -1 +1 @@
-acd7bc0e2ee1d9dc3311ee37e74e2cb5b59f15559a1d29aacc703ddacf323199  plugkit-slim.wasm
+fc7364d869507c548db7846b67e71084c8d9c0c5a18c39a09afaf3f28155d4cd  plugkit-slim.wasm

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.935
+0.1.936

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-89e0937c8879886b66420c807e7decc29d6723df91300c63028de6c6cefeed1b  plugkit.wasm
+6492759f1cf535d6b899f22d1a31c00296397ae493aa755a6c735940128d9b18  plugkit.wasm

package/gm-plugkit/bootstrap.js

@@ -1263,37 +1263,6 @@ function getBinaryPath() {
   return getWasmPath();
 }
 
-function probeUnsupervisedWatcher(spoolDir) {
-  try {
-    const statusPath = path.join(spoolDir, '.status.json');
-    const supervisorPath = path.join(spoolDir, '.supervisor.json');
-    const markerPath = path.join(spoolDir, '.pre-supervised-watcher.json');
-    if (!fs.existsSync(statusPath)) {
-      try { fs.unlinkSync(markerPath); } catch (_) {}
-      return;
-    }
-    const status = JSON.parse(fs.readFileSync(statusPath, 'utf-8'));
-    const age = Date.now() - (status && status.ts || 0);
-    if (age > 30_000) {
-      try { fs.unlinkSync(markerPath); } catch (_) {}
-      return;
-    }
-    if (fs.existsSync(supervisorPath)) {
-      try { fs.unlinkSync(markerPath); } catch (_) {}
-      return;
-    }
-    const marker = {
-      ts: Date.now(),
-      reason: 'running-watcher-has-no-supervisor',
-      watcher_pid: status.pid,
-      watcher_version: status.version,
-      severity: 'warn',
-      instruction: 'A running watcher was started under an older bootstrap that did not spawn a supervisor. Unplanned-restart recovery and idle-teardown coordination are dormant. To migrate, stop the current watcher (taskkill /F /T /PID <watcher_pid> on Windows or kill <watcher_pid> on POSIX) and let the next bootstrap re-spawn it under supervisor.js.',
-    };
-    fs.writeFileSync(markerPath, JSON.stringify(marker, null, 2));
-  } catch (_) {}
-}
-
 function resolveNodeRuntime() {
   const candidates = [];
   if (process.env.PLUGKIT_RUNTIME) candidates.push(process.env.PLUGKIT_RUNTIME);
@@ -1337,7 +1306,6 @@ function startSpoolDaemon() {
     const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
     const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
     fs.mkdirSync(spoolDir, { recursive: true });
-    probeUnsupervisedWatcher(spoolDir);
     const logPath = path.join(spoolDir, '.watcher.log');
     try {
       const stat = fs.statSync(logPath);
@@ -1347,36 +1315,20 @@ function startSpoolDaemon() {
       }
     } catch (_) {}
 
-    const supervisor = path.join(__dirname, 'supervisor.js');
-    if (process.env.PLUGKIT_SKIP_SUPERVISOR === '1' || !fs.existsSync(supervisor)) {
-      const cmd = runtime;
-      const args = [wrapper, 'spool'];
-      const logFd = fs.openSync(logPath, 'a');
-      try { fs.writeSync(logFd, `\n--- daemon spawn ${new Date().toISOString()} parent=${process.pid} (no supervisor) ---\n`); } catch (_) {}
-      const child = require('child_process').spawn(cmd, args, {
-        detached: true,
-        stdio: ['ignore', logFd, logFd],
-        windowsHide: true,
-        env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir, PLUGKIT_BOOT_REASON: 'direct-no-supervisor' },
-      });
-      try { fs.closeSync(logFd); } catch (_) {}
-      const pid = child.pid;
-      child.unref();
-      return { ok: true, pid, wrapper, runtime: cmd, logPath, supervised: false };
-    }
-
+    const cmd = runtime;
+    const args = [wrapper, 'spool'];
     const logFd = fs.openSync(logPath, 'a');
-    try { fs.writeSync(logFd, `\n--- supervisor spawn ${new Date().toISOString()} parent=${process.pid} ---\n`); } catch (_) {}
-    const child = require('child_process').spawn(runtime, [supervisor], {
+    try { fs.writeSync(logFd, `\n--- daemon spawn ${new Date().toISOString()} parent=${process.pid} (js-host fallback, native runner absent) ---\n`); } catch (_) {}
+    const child = require('child_process').spawn(cmd, args, {
       detached: true,
       stdio: ['ignore', logFd, logFd],
       windowsHide: true,
-      env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir, PLUGKIT_RUNTIME: runtime },
+      env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir, PLUGKIT_BOOT_REASON: 'js-host-fallback' },
     });
     try { fs.closeSync(logFd); } catch (_) {}
     const pid = child.pid;
     child.unref();
-    return { ok: true, pid, wrapper, supervisor, runtime, logPath, supervised: true };
+    return { ok: true, pid, wrapper, runtime: cmd, logPath, supervised: false };
   } catch (e) {
     return { ok: false, error: e.message };
   }

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.2023",
+  "version": "2.0.2025",
   "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": {
@@ -11,7 +11,6 @@
     "cli.js",
     "index.js",
     "bootstrap.js",
-    "supervisor.js",
     "plugkit-wasm-wrapper.js",
     "gm-log.js",
     "gm-process.js",

package/gm-plugkit/plugkit-slim.wasm.sha256

@@ -1 +1 @@
-acd7bc0e2ee1d9dc3311ee37e74e2cb5b59f15559a1d29aacc703ddacf323199  plugkit-slim.wasm
+fc7364d869507c548db7846b67e71084c8d9c0c5a18c39a09afaf3f28155d4cd  plugkit-slim.wasm

package/gm-plugkit/plugkit.version

@@ -1 +1 @@
-0.1.935
+0.1.936

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.2023",
+  "version": "2.0.2025",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -17,5 +17,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "plugkitVersion": "0.1.935"
+  "plugkitVersion": "0.1.936"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.2023",
+  "version": "2.0.2025",
   "description": "Canonical universal harness — AI-native software engineering via skill-driven orchestration; bootstraps plugkit for task execution and session isolation. Install in any AI coding agent host.",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -42,7 +42,6 @@
     "gm-plugkit/index.js",
     "gm-plugkit/package.json",
     "gm-plugkit/plugkit-wasm-wrapper.js",
-    "gm-plugkit/supervisor.js",
     "gm-plugkit/gm-log.js",
     "gm-plugkit/gm-process.js",
     "gm-plugkit/plugkit.version",

package/gm-plugkit/supervisor.js

@@ -1,402 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-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, pidAliveSync, waitForPidDeath } = require('./gm-process');
-
-function wrapperSha12OnDisk() {
-  try {
-    const wp = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-    return crypto.createHash('sha256').update(fs.readFileSync(wp)).digest('hex').slice(0, 12);
-  } catch (_) { return null; }
-}
-
-// Root the spool/lock state at the git common dir (see resolveProjectRoot's
-// own doc comment in bootstrap.js for the full worktree-dedup rationale) so
-// a worktree-spawned supervisor shares its lock/spoolDir with the main-repo
-// checkout instead of always cold-booting its own independent watcher.
-const projectDir = resolveProjectRoot(process.env.CLAUDE_PROJECT_DIR || process.cwd());
-const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
-fs.mkdirSync(spoolDir, { recursive: true });
-
-const STATUS_PATH = path.join(spoolDir, '.status.json');
-const SHUTDOWN_REASON_PATH = path.join(spoolDir, '.shutdown-reason.json');
-const SUPERVISOR_PATH = path.join(spoolDir, '.supervisor.json');
-const SUPERVISOR_PID_PATH = path.join(spoolDir, '.supervisor.pid');
-const LOG_PATH = path.join(spoolDir, '.watcher.log');
-const GM_LOG_ROOT = _sharedGmLogRoot;
-
-const POLL_INTERVAL_MS = 10_000;
-const STATUS_STALE_MS = 30_000;
-const MAX_RESTART_BURST = 5;
-const RESTART_WINDOW_MS = 60_000;
-const BURST_BACKOFF_MS = 60_000;
-const VERSION_DRIFT_COOLDOWN_MS = 60_000;
-
-function logEvent(event, fields) {
-  _sharedLogEvent('plugkit', event, fields, { sess: process.env.CLAUDE_SESSION_ID || '', role: 'supervisor' });
-}
-
-function writeSupervisorStatus(state, extra) {
-  try {
-    fs.writeFileSync(SUPERVISOR_PATH, JSON.stringify({
-      pid: process.pid,
-      ts: Date.now(),
-      state,
-      ...(extra || {}),
-    }));
-  } catch (_) {}
-}
-
-function pidCommandLineForKillGuard(pid) {
-  return _sharedPidCommandLine(pid);
-}
-
-function pidIsPlugkitProcess(pid) {
-  return /plugkit-wasm-wrapper\.js|plugkit-supervisor\.js|gm-plugkit[\\\/]supervisor\.js/i.test(pidCommandLineForKillGuard(pid));
-}
-
-function writeKillAttribution(targetSpoolDir, info) {
-  try {
-    fs.mkdirSync(targetSpoolDir, { recursive: true });
-    fs.writeFileSync(path.join(targetSpoolDir, '.kill-attribution.json'), JSON.stringify({ killer_pid: process.pid, killer_cwd: process.cwd(), killer_script: __filename, ts: Date.now(), ...info }, null, 2));
-  } catch (_) {}
-}
-
-function pidAlive(pid) {
-  if (!Number.isFinite(pid) || pid <= 0) return false;
-  try { process.kill(pid, 0); return true; } catch (_) { return false; }
-}
-
-function acquireSingleInstance() {
-  for (let attempt = 0; attempt < 2; attempt++) {
-    try {
-      const fd = fs.openSync(SUPERVISOR_PID_PATH, 'wx');
-      try { fs.writeSync(fd, String(process.pid)); } finally { fs.closeSync(fd); }
-      return true;
-    } catch (e) {
-      if (e && e.code === 'EEXIST') {
-        let other = NaN;
-        try { other = parseInt(fs.readFileSync(SUPERVISOR_PID_PATH, 'utf-8').trim(), 10); } catch (_) {}
-        if (Number.isFinite(other) && other !== process.pid && pidAlive(other)) {
-          const TAKEOVER_STALE_MS = 45_000;
-          const now = Date.now();
-          let supTs = 0;
-          try { supTs = (JSON.parse(fs.readFileSync(SUPERVISOR_PATH, 'utf-8')).ts) || 0; } catch (_) {}
-          const spool = readStatus();
-          const spoolBusy = spool && spool.busy_until && spool.busy_until > now;
-          const spoolTs = (spool && spool.ts) || 0;
-          const holderWedged = !spoolBusy
-            && (now - supTs) > TAKEOVER_STALE_MS
-            && (now - spoolTs) > TAKEOVER_STALE_MS;
-          if (!holderWedged) {
-            logEvent('supervisor.refused-duplicate', { existing_pid: other, severity: 'warn' });
-            return false;
-          }
-          logEvent('supervisor.takeover-wedged', {
-            existing_pid: other,
-            supervisor_status_age_ms: now - supTs,
-            spool_status_age_ms: now - spoolTs,
-            severity: 'critical',
-          });
-          if (pidIsPlugkitProcess(other)) {
-            writeKillAttribution(spoolDir, { reason: 'supervisor-takeover-wedged', target_pid: other, via: 'supervisor-duel' });
-            try { process.kill(other, 'SIGTERM'); } catch (_) {}
-            if (process.platform === 'win32') {
-              try { spawnSync('taskkill', ['/F', '/T', '/PID', String(other)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
-            }
-          } else {
-            logEvent('supervisor.takeover-kill-skipped-pid-reused', { existing_pid: other, severity: 'warn' });
-          }
-        }
-        try { fs.unlinkSync(SUPERVISOR_PID_PATH); } catch (_) {}
-        continue;
-      }
-      logEvent('supervisor.pid-write-failed', { error: e && e.message, severity: 'warn' });
-      return true;
-    }
-  }
-  return true;
-}
-
-function releaseSingleInstance() {
-  try {
-    if (fs.existsSync(SUPERVISOR_PID_PATH)) {
-      const raw = fs.readFileSync(SUPERVISOR_PID_PATH, 'utf-8').trim();
-      if (parseInt(raw, 10) === process.pid) fs.unlinkSync(SUPERVISOR_PID_PATH);
-    }
-  } catch (_) {}
-}
-
-function readStatus() {
-  try { return JSON.parse(fs.readFileSync(STATUS_PATH, 'utf-8')); } catch (_) { return null; }
-}
-
-function readShutdownReason() {
-  try { return JSON.parse(fs.readFileSync(SHUTDOWN_REASON_PATH, 'utf-8')); } catch (_) { return null; }
-}
-
-// A supervisor-initiated kill is PLANNED (version/wrapper drift, heartbeat-stale),
-// but on Windows process.kill(pid,'SIGTERM') terminates the child immediately with
-// no catchable signal, so the child never writes its own .shutdown-reason.json and
-// the taskkill /F that follows leaves none either -- the NEXT boot then mislabels a
-// 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 killChild(reason) {
-  if (!currentChildPid) return;
-  const pid = currentChildPid;
-  try { fs.writeFileSync(SHUTDOWN_REASON_PATH, JSON.stringify({ reason, ts: Date.now(), pid, killed_by_supervisor: true })); } catch (_) {}
-  try { process.kill(pid, 'SIGTERM'); } catch (_) {}
-  if (process.platform === 'win32') {
-    try { spawnSync('taskkill', ['/F', '/T', '/PID', String(pid)], { stdio: 'ignore', windowsHide: true, timeout: 3000 }); } catch (_) {}
-  }
-  waitForPidDeath(pid, 5000);
-}
-
-let lastSpawnedAt = 0;
-let lastVersionDriftActionAt = 0;
-let restartTimestamps = [];
-let currentChildPid = null;
-let currentBootReason = 'initial';
-
-function spawnWatcher(bootReason) {
-  lastSpawnedAt = Date.now();
-  restartTimestamps.push(Date.now());
-  restartTimestamps = restartTimestamps.filter(t => Date.now() - t < RESTART_WINDOW_MS);
-  if (restartTimestamps.length > MAX_RESTART_BURST) {
-    logEvent('supervisor.restart-burst-backoff', {
-      reason: 'restart-burst-exceeded',
-      restarts_in_window: restartTimestamps.length,
-      window_ms: RESTART_WINDOW_MS,
-      max: MAX_RESTART_BURST,
-      backoff_ms: BURST_BACKOFF_MS,
-      severity: 'warn',
-    });
-    writeSupervisorStatus('backoff', { reason: 'restart-burst-exceeded', backoff_ms: BURST_BACKOFF_MS });
-    restartTimestamps = [];
-    setTimeout(() => spawnWatcher('post-burst-backoff'), BURST_BACKOFF_MS);
-    return;
-  }
-
-  const wrapper = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-  if (!fs.existsSync(wrapper)) {
-    logEvent('supervisor.wrapper-missing', { wrapper, severity: 'critical' });
-    writeSupervisorStatus('error', { error: 'wrapper-missing' });
-    process.exit(3);
-  }
-
-  const isNodeExe = (p) => /(^|[\\/])node(\.exe)?$/i.test(String(p || ''));
-  const resolveRuntime = () => {
-    const candidates = [];
-    if (process.env.PLUGKIT_RUNTIME) candidates.push(process.env.PLUGKIT_RUNTIME);
-    candidates.push('bun');
-    try {
-      const which = process.platform === 'win32' ? 'where' : 'which';
-      const out = spawnSync(which, ['bun'], { encoding: 'utf8', windowsHide: true });
-      if (out && out.stdout) {
-        const first = out.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)[0];
-        if (first) candidates.push(first);
-      }
-    } catch (_) {}
-    for (const c of candidates) {
-      try { const r = spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
-    }
-    const nodeCandidates = [];
-    if (isNodeExe(process.execPath)) nodeCandidates.push(process.execPath);
-    if (process.env.GM_NODE_PATH) nodeCandidates.push(process.env.GM_NODE_PATH);
-    try {
-      const which = process.platform === 'win32' ? 'where' : 'which';
-      const out = spawnSync(which, ['node'], { encoding: 'utf8', windowsHide: true });
-      if (out && out.stdout) {
-        const first = out.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)[0];
-        if (first) nodeCandidates.push(first);
-      }
-    } catch (_) {}
-    for (const c of nodeCandidates) {
-      try { const r = spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
-    }
-    return process.execPath;
-  };
-  let cmd = resolveRuntime();
-  let args = [wrapper, 'spool'];
-
-  let logFd = null;
-  try { logFd = fs.openSync(LOG_PATH, 'a'); } catch (_) {}
-  try {
-    if (logFd !== null) fs.writeSync(logFd, `\n--- watcher spawn ${new Date().toISOString()} supervisor=${process.pid} reason=${bootReason} ---\n`);
-  } catch (_) {}
-
-  const child = spawn(cmd, args, {
-    detached: false,
-    stdio: ['ignore', logFd || 'ignore', logFd || 'ignore'],
-    windowsHide: true,
-    env: {
-      ...process.env,
-      CLAUDE_PROJECT_DIR: projectDir,
-      PLUGKIT_BOOT_REASON: bootReason,
-      PLUGKIT_SUPERVISOR_PID: String(process.pid),
-    },
-  });
-
-  try { if (logFd !== null) fs.closeSync(logFd); } catch (_) {}
-  currentChildPid = child.pid;
-  currentBootReason = bootReason;
-  writeSupervisorStatus('watching', { watcher_pid: child.pid, boot_reason: bootReason });
-  logEvent('supervisor.spawned-watcher', { watcher_pid: child.pid, boot_reason: bootReason, runtime: cmd });
-
-  child.on('exit', (code, signal) => {
-    const shutdownReason = readShutdownReason();
-    const reason = shutdownReason && shutdownReason.reason;
-    const idleClean = reason === 'idle';
-    const lockRejected = code === 75;
-    const cleanExit = code === 0;
-    const plannedReasons = new Set(['idle', 'sigterm', 'version-change', 'wrapper-change', 'heartbeat-stale', 'peer-stale-takeover', 'external-planned', 'process-exit']);
-    const isPlanned = plannedReasons.has(reason) || lockRejected || cleanExit;
-    const eventName = idleClean
-      ? 'supervisor.watcher-exited-idle'
-      : reason === 'version-change'
-        ? 'supervisor.watcher-exited-for-update'
-        : lockRejected
-          ? 'supervisor.watcher-exited-lock-rejected'
-          : cleanExit
-            ? 'supervisor.watcher-exited-clean'
-            : 'supervisor.watcher-exited-unexpectedly';
-    logEvent(eventName, {
-      watcher_pid: currentChildPid,
-      exit_code: code,
-      signal,
-      shutdown_reason: reason || null,
-      had_shutdown_reason_file: shutdownReason !== null,
-      severity: isPlanned ? 'info' : 'critical',
-      uptime_ms: Date.now() - lastSpawnedAt,
-      ...(shutdownReason || {}),
-    });
-    if (idleClean) {
-      writeSupervisorStatus('exited-idle', { watcher_pid: currentChildPid });
-      try { fs.unlinkSync(SUPERVISOR_PATH); } catch (_) {}
-      process.exit(0);
-    }
-    if (lockRejected) {
-      writeSupervisorStatus('exited-lock-rejected', { watcher_pid: currentChildPid });
-      try { fs.unlinkSync(SUPERVISOR_PATH); } catch (_) {}
-      process.exit(0);
-    }
-    const respawnReason = reason === 'version-change'
-      ? 'planned-restart-version-change'
-      : isPlanned
-        ? `planned-restart-after-${reason || (cleanExit ? 'clean-exit' : 'exit')}`
-        : 'unplanned-restart-after-exit';
-    writeSupervisorStatus('restarting', {
-      prior_watcher_pid: currentChildPid,
-      prior_exit_code: code,
-      prior_signal: signal,
-      prior_shutdown_reason: reason || null,
-      respawn_reason: respawnReason,
-    });
-    setTimeout(() => spawnWatcher(respawnReason), 1500);
-  });
-
-  child.on('error', (err) => {
-    logEvent('supervisor.spawn-error', { error: err.message, severity: 'critical' });
-  });
-}
-
-function checkWatcherHealth() {
-  if (!currentChildPid) return;
-  if (!pidAlive(currentChildPid)) {
-    return;
-  }
-  const status = readStatus();
-  if (!status) {
-    logEvent('supervisor.status-missing', {
-      watcher_pid: currentChildPid,
-      severity: 'warn',
-    });
-    return;
-  }
-  const now = Date.now();
-  if (status.busy_until && status.busy_until > now) {
-    return;
-  }
-  const age = now - (status.ts || 0);
-  if (age > STATUS_STALE_MS) {
-    logEvent('supervisor.heartbeat-stale', {
-      watcher_pid: currentChildPid,
-      status_pid: status.pid,
-      status_age_ms: age,
-      stale_limit_ms: STATUS_STALE_MS,
-      severity: 'critical',
-    });
-    killChild('heartbeat-stale');
-    return;
-  }
-  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',
-    });
-    killChild('wrapper-change');
-    return;
-  }
-  if (status.version_drifted === true) {
-    if (now - lastVersionDriftActionAt < VERSION_DRIFT_COOLDOWN_MS) {
-      return;
-    }
-    lastVersionDriftActionAt = now;
-    logEvent('supervisor.version-drift', {
-      watcher_pid: currentChildPid,
-      instance_version: status.instance_version || null,
-      file_version: status.file_version || null,
-      cooldown_ms: VERSION_DRIFT_COOLDOWN_MS,
-      severity: 'critical',
-    });
-    try {
-      const gmTools = gmToolsDir();
-      for (const f of ['plugkit.wasm', 'plugkit.version', 'plugkit.wasm.sha256']) {
-        try { fs.unlinkSync(path.join(gmTools, f)); } catch (_) {}
-      }
-    } catch (_) {}
-    killChild('version-change');
-  }
-}
-
-process.on('SIGINT', () => {
-  logEvent('supervisor.shutdown', { reason: 'sigint' });
-  writeSupervisorStatus('shutdown', { reason: 'sigint' });
-  if (currentChildPid && pidAlive(currentChildPid)) {
-    try { process.kill(currentChildPid, 'SIGTERM'); } catch (_) {}
-  }
-  process.exit(0);
-});
-process.on('SIGTERM', () => {
-  logEvent('supervisor.shutdown', { reason: 'sigterm' });
-  writeSupervisorStatus('shutdown', { reason: 'sigterm' });
-  if (currentChildPid && pidAlive(currentChildPid)) {
-    try { process.kill(currentChildPid, 'SIGTERM'); } catch (_) {}
-  }
-  releaseSingleInstance();
-  process.exit(0);
-});
-process.on('exit', () => { releaseSingleInstance(); });
-
-if (!acquireSingleInstance()) {
-  process.stderr.write('[plugkit-supervisor] another supervisor is alive; exiting\n');
-  process.exit(0);
-}
-writeSupervisorStatus('starting', {});
-logEvent('supervisor.starting', { spool_dir: spoolDir });
-try { fs.unlinkSync(path.join(spoolDir, '.pre-supervised-watcher.json')); } catch (_) {}
-spawnWatcher('initial');
-setInterval(checkWatcherHealth, POLL_INTERVAL_MS);
-setInterval(() => writeSupervisorStatus('watching', { watcher_pid: currentChildPid, boot_reason: currentBootReason }), 10_000);