gm-plugkit 2.0.2025 → 2.0.2026

package/bootstrap.js

@@ -258,19 +258,17 @@ function gmToolsDir() {
 // before ever loading its wasm-embedded safetensors fallback (see
 // rs-plugkit/crates/plugkit-core/src/embed.rs::init_ctx) -- a slim build
 // (feature=slim, no embedded weights at all) is only safe to fetch on a host
-// that actually answers host_vec_embed for real. plugkit-wasm-wrapper.js
-// wires that answer through gm-runner's native candle path
-// (hostEmbedViaGmRunner) or agentplug-runner's shared daemon, both gated on
-// one of these two binaries existing under ~/.gm-tools -- mirrors that same
-// on-disk presence check here so bootstrap-time artifact selection and
-// runtime embed-delegation eligibility never disagree. Absence of both means
-// no host_vec_embed answer will ever come, so fetching fat (which carries its
-// own wasm-side embedding fallback) is the only safe choice.
+// that actually answers host_vec_embed for real. agentplug-runner answers it
+// via its shared bert plugin daemon; the check is gated on the runner binary
+// existing under ~/.gm-tools so bootstrap-time artifact selection and runtime
+// embed-delegation eligibility never disagree. Absence means no host_vec_embed
+// answer will ever come, so fetching fat (which carries its own wasm-side
+// embedding fallback) is the only safe choice.
 function hasNativeEmbedRunner() {
   const dir = gmToolsDir();
   const names = process.platform === 'win32'
-    ? ['gm-runner.exe', 'agentplug-runner.exe']
-    : ['gm-runner', 'agentplug-runner'];
+    ? ['agentplug-runner.exe']
+    : ['agentplug-runner'];
   return names.some(n => { try { return fs.existsSync(path.join(dir, n)); } catch (_) { return false; } });
 }
 
@@ -279,21 +277,21 @@ function hasNativeEmbedRunner() {
 // agents, each `git worktree add`-ing a fresh physical directory) shares the
 // SAME underlying repo as its main checkout but has its own separate
 // directory tree. Every cwd-derived project-dir computation in this file and
-// in supervisor.js/cli.js must funnel through this so a worktree-spawned
-// process resolves to the SAME .gm/exec-spool/ as its main-repo sibling --
-// otherwise the single-instance supervisor lock can never see a sibling
-// worktree's already-running watcher, and every worktree cold-boots its own
-// independent watcher (each loading the full embed model + running its own
-// cold reindex of what is, conceptually, the same project). Live-measured
+// in cli.js must funnel through this so a worktree-spawned process resolves to
+// the SAME .gm/exec-spool/ as its main-repo sibling -- otherwise the
+// single-instance watcher guard can never see a sibling worktree's
+// already-running watcher, and every worktree cold-boots its own independent
+// watcher (each loading the full embed model + running its own cold reindex of
+// what is, conceptually, the same project). Live-measured
 // this session under real concurrent multi-agent load: this was the actual
 // root cause of a user-flagged "memory grows to ~2GB then clears" churn
 // pattern -- N worktrees of one repo each independently paying full
 // cold-embed cost instead of sharing one already-warm watcher, and the
 // resulting CPU contention pushed genuinely-busy processes past their
 // heartbeat deadline into a restart cycle that produces the sawtooth memory
-// pattern. Mirrors the existing browserRootDir() resolution already used for
-// browser-session state in plugkit-wasm-wrapper.js (same fix, same reason,
-// applied one layer up at the process-boot-dedup level).
+// pattern. agentplug-runner roots its own browser-session state at the git
+// common dir for the same reason (same fix, same reason, applied one layer up
+// at the process-boot-dedup level).
 function resolveProjectRoot(start) {
   const resolved = path.resolve(start);
   try {
@@ -373,23 +371,6 @@ function releaseLock(lockPath) {
   try { fs.unlinkSync(lockPath); } catch (_) {}
 }
 
-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 {
@@ -590,7 +571,7 @@ function pidCommandLineForKillGuard(pid) {
 }
 
 function pidIsPlugkitProcess(pid) {
-  return /plugkit-wasm-wrapper\.js|plugkit-supervisor\.js|gm-plugkit[\\\/]supervisor\.js/i.test(pidCommandLineForKillGuard(pid));
+  return /agentplug-runner(\.exe)?/i.test(pidCommandLineForKillGuard(pid));
 }
 
 function writeKillAttribution(targetSpoolDir, info) {
@@ -854,8 +835,6 @@ function copyWasmToGmTools(wasmPath, version) {
   const dst = gmToolsDir();
   fs.mkdirSync(dst, { recursive: true });
   const target = path.join(dst, 'plugkit.wasm');
-  const wrapperSrc = path.join(__dirname, 'plugkit-wasm-wrapper.js');
-  const wrapperDst = path.join(dst, 'plugkit-wasm-wrapper.js');
 
   let wasmFresh = false;
   if (fs.existsSync(target)) {
@@ -888,17 +867,6 @@ function copyWasmToGmTools(wasmPath, version) {
     }
   } catch (_) {}
 
-  if (fs.existsSync(wrapperSrc)) {
-    let wrapperFresh = false;
-    if (fs.existsSync(wrapperDst)) {
-      try {
-        const cur = sha256OfFileSync(wrapperDst);
-        const src = sha256OfFileSync(wrapperSrc);
-        if (cur === src) wrapperFresh = true;
-      } catch (_) {}
-    }
-    if (!wrapperFresh) fs.copyFileSync(wrapperSrc, wrapperDst);
-  }
 }
 
 function getWasmPath() {
@@ -915,60 +883,6 @@ function isReady() {
   return fs.existsSync(wasm);
 }
 
-function runningFromGmSourceRepo() {
-  try {
-    const pkgPath = path.join(__dirname, '..', 'package.json');
-    if (!fs.existsSync(pkgPath)) return false;
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-    return pkg && pkg.name === 'gm-skill';
-  } catch (_) { return false; }
-}
-
-function ensureWrapperFresh() {
-  try {
-    const wrapperSrc = path.join(__dirname, 'plugkit-wasm-wrapper.js');
-    const wrapperDst = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-    if (!fs.existsSync(wrapperSrc)) return false;
-    if (runningFromGmSourceRepo() && process.env.GM_PLUGKIT_ALLOW_DEV_WRAPPER_OVERWRITE !== '1') {
-      log(`refusing to overwrite the shared ~/.gm-tools wrapper from the gm source repo (${wrapperSrc}) -- this machine-wide install is shared by every project's watcher; set GM_PLUGKIT_ALLOW_DEV_WRAPPER_OVERWRITE=1 to opt in, or use 'bun x gm-plugkit@latest' which fetches an isolated npm copy instead`);
-      return false;
-    }
-    let same = false;
-    if (fs.existsSync(wrapperDst)) {
-      try {
-        const a = sha256OfFileSync(wrapperSrc);
-        const b = sha256OfFileSync(wrapperDst);
-        if (a === b) same = true;
-      } catch (_) {}
-    }
-    if (same) return false;
-    // Many independent per-project watchers share this one gmToolsDir() install --
-    // concurrent CLI invocations from different projects can race this copy, so
-    // it's lock-guarded (atomic O_EXCL) + tmp-write-then-rename, never a direct
-    // in-place copyFileSync another reader could observe half-written.
-    fs.mkdirSync(gmToolsDir(), { recursive: true });
-    const lockPath = wrapperDst + '.lock';
-    acquireLock(lockPath);
-    try {
-      let stillSame = false;
-      if (fs.existsSync(wrapperDst)) {
-        try {
-          const a = sha256OfFileSync(wrapperSrc);
-          const b = sha256OfFileSync(wrapperDst);
-          if (a === b) stillSame = true;
-        } catch (_) {}
-      }
-      if (stillSame) return false;
-      const tmpDst = wrapperDst + '.tmp.' + process.pid;
-      fs.copyFileSync(wrapperSrc, tmpDst);
-      fs.renameSync(tmpDst, wrapperDst);
-      return true;
-    } finally {
-      releaseLock(lockPath);
-    }
-  } catch (_) { return false; }
-}
-
 function ensureGmPlugkitVersionFresh() {
   try {
     const ownPkg = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'));
@@ -1223,10 +1137,9 @@ async function ensureReady(opts) {
 
   if (isReady() && !versionDrift) {
     const wasmPath = getWasmPath();
-    const wrapperUpdated = ensureWrapperFresh();
     const versionMarkerUpdated = ensureGmPlugkitVersionFresh();
     ensureSkillMdFresh();
-    return { ok: true, wasmPath, binaryPath: wasmPath, status: (wrapperUpdated || versionMarkerUpdated) ? 'wrapper-refreshed' : 'already-ready', version: installed };
+    return { ok: true, wasmPath, binaryPath: wasmPath, status: versionMarkerUpdated ? 'version-refreshed' : 'already-ready', version: installed };
   }
   if (targetVersion && targetVersion !== pinnedVersion) {
     try {
@@ -1243,7 +1156,6 @@ async function ensureReady(opts) {
     if (versionDrift && isReady()) {
       log(`bootstrap for ${targetVersion} failed (${bootErr.message || bootErr}); keeping running watcher on installed ${installed} (no kill, serve cached wasm)`);
       const cachedPath = getWasmPath();
-      ensureWrapperFresh();
       ensureSkillMdFresh();
       return { ok: true, wasmPath: cachedPath, binaryPath: cachedPath, status: 'bootstrap-failed-served-cached', version: installed };
     }
@@ -1254,7 +1166,6 @@ async function ensureReady(opts) {
     try { killSpoolWatcherInCwd(`version_drift:${installed}->${targetVersion}`); } catch (_) {}
   }
 
-  ensureWrapperFresh();
   ensureSkillMdFresh();
   return { ok: true, wasmPath, binaryPath: wasmPath, status: 'bootstrapped', version: targetVersion || installed };
 }
@@ -1263,46 +1174,21 @@ function getBinaryPath() {
   return getWasmPath();
 }
 
-function resolveNodeRuntime() {
-  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 = require('child_process').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 = require('child_process').spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
-  }
-  const isNodeExe = (p) => /(^|[\\/])node(\.exe)?$/i.test(String(p || ''));
-  const nodeCandidates = [];
-  if (isNodeExe(process.env.GM_NODE_PATH)) nodeCandidates.push(process.env.GM_NODE_PATH);
-  if (isNodeExe(process.execPath)) nodeCandidates.push(process.execPath);
-  try {
-    const which = process.platform === 'win32' ? 'where' : 'which';
-    const out = require('child_process').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 = require('child_process').spawnSync(c, ['--version'], { stdio: 'ignore', windowsHide: true }); if (r && r.status === 0) return c; } catch (_) {}
-  }
-  return process.execPath;
-}
-
 function startSpoolDaemon() {
   try {
-    const wrapper = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-    if (!fs.existsSync(wrapper)) {
-      return { ok: false, error: `wrapper not at ${wrapper} -- ensureReady() must run first` };
+    const runnerName = process.platform === 'win32' ? 'agentplug-runner.exe' : 'agentplug-runner';
+    const runner = path.join(gmToolsDir(), runnerName);
+    if (!fs.existsSync(runner)) {
+      return {
+        ok: false,
+        error:
+          `agentplug-runner is not installed at ${runner} and is the sole supported spool loader. ` +
+          `The JS wasm-host has been retired. Install it with 'bun x gm-skill install' (or 'npx gm-skill install'), ` +
+          `which downloads the sha256-verified native runner from AnEntrypoint/agentplug-bin for this platform ` +
+          `(${process.platform}/${process.arch}). If no binary is published for this platform yet, there is no ` +
+          `loader available -- file an issue at https://github.com/AnEntrypoint/agentplug-bin so a binary is built for it.`,
+      };
     }
-    const runtime = resolveNodeRuntime();
     const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
     const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
     fs.mkdirSync(spoolDir, { recursive: true });
@@ -1315,20 +1201,18 @@ function startSpoolDaemon() {
       }
     } catch (_) {}
 
-    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} (js-host fallback, native runner absent) ---\n`); } catch (_) {}
-    const child = require('child_process').spawn(cmd, args, {
+    try { fs.writeSync(logFd, `\n--- daemon spawn ${new Date().toISOString()} parent=${process.pid} (agentplug-runner) ---\n`); } catch (_) {}
+    const child = require('child_process').spawn(runner, ['spool'], {
       detached: true,
       stdio: ['ignore', logFd, logFd],
       windowsHide: true,
-      env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir, PLUGKIT_BOOT_REASON: 'js-host-fallback' },
+      env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir, PLUGKIT_BOOT_REASON: 'agentplug-runner' },
     });
     try { fs.closeSync(logFd); } catch (_) {}
     const pid = child.pid;
     child.unref();
-    return { ok: true, pid, wrapper, runtime: cmd, logPath, supervised: false };
+    return { ok: true, pid, runner, logPath, supervised: false };
   } catch (e) {
     return { ok: false, error: e.message };
   }
@@ -1356,7 +1240,6 @@ module.exports = {
   readVersionFile,
   ensureGmPlugkitVersionFresh,
   ensureSkillMdFresh,
-  ensureWrapperFresh,
   readPinnedGmPlugkitVersion,
   resolveBunRuntime,
   spawnPinnedBoot,

package/cli.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 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 { ensureReady, startSpoolDaemon, gmToolsDir, readVersionFile, ensureGmPlugkitVersionFresh, ensureSkillMdFresh, isReady, getWasmPath, readPinnedGmPlugkitVersion, spawnPinnedBoot, resolveProjectRoot } = require('./bootstrap');
 const { pidAliveSync, waitForPidDeath } = require('./gm-process');
 
 function getWasmPathSafe() {
@@ -60,10 +60,6 @@ Usage:
   bun x gm-plugkit@latest --daemon           Same as default
   bun x gm-plugkit@latest --binary           Print binary path only
   bun x gm-plugkit@latest --status           JSON status check
-  bun x gm-plugkit@latest --kill-stale-watchers
-                                             Kill plugkit watchers whose in-memory
-                                             wrapper sha differs from on-disk
-                                             (lets new wrapper code load on next bootstrap)
   bun x gm-plugkit@latest --help             Show this help
 
 Opt-in pinned fast-path (skips bunx's own @latest npm-registry resolution):
@@ -83,111 +79,6 @@ Opt-in pinned fast-path (skips bunx's own @latest npm-registry resolution):
                                              unaffected.
 `;
 
-function readDiskWasmVersion() {
-  try {
-    const versionFile = path.join(gmToolsDir(), 'plugkit.version');
-    return fs.readFileSync(versionFile, 'utf-8').trim() || null;
-  } catch (_) { return null; }
-}
-
-function readWatcherInstanceVersion(pid) {
-  try {
-    const ps = process.platform === 'win32'
-      ? `(Get-WmiObject Win32_Process -Filter "ProcessId=${pid}").CommandLine`
-      : null;
-    if (!ps) return null;
-    const out = cp.execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', ps], { encoding: 'utf-8', windowsHide: true });
-    const m = out.match(/([A-Z]:\\[^"\s]+\.gm[\\/]exec-spool)/i);
-    if (!m) return null;
-    const statusPath = path.join(m[1].replace(/[\\/]exec-spool.*$/, ''), 'exec-spool', '.status.json');
-    if (!fs.existsSync(statusPath)) return null;
-    const status = JSON.parse(fs.readFileSync(statusPath, 'utf-8'));
-    return status && status.instance_version ? status.instance_version : null;
-  } catch (_) { return null; }
-}
-
-function killStaleWatchers() {
-  try {
-    const wrapperPath = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-    if (!fs.existsSync(wrapperPath)) {
-      console.log(JSON.stringify({ ok: false, error: `wrapper not installed at ${wrapperPath}` }));
-      return 1;
-    }
-    const diskMtime = fs.statSync(wrapperPath).mtimeMs;
-    const diskWasmVersion = readDiskWasmVersion();
-    let localStatus = null;
-    try {
-      const localStatusPath = path.join(process.cwd(), '.gm', 'exec-spool', '.status.json');
-      if (fs.existsSync(localStatusPath)) localStatus = JSON.parse(fs.readFileSync(localStatusPath, 'utf-8'));
-    } catch (_) { localStatus = null; }
-    const stale = [];
-    const fresh = [];
-    function consider(pid, startedMs) {
-      const reasons = [];
-      if (startedMs < diskMtime) reasons.push('wrapper-mtime');
-      let instV = readWatcherInstanceVersion(pid);
-      if (!instV && localStatus && localStatus.pid === pid) {
-        instV = localStatus.instance_version || localStatus.version || null;
-      }
-      if (diskWasmVersion && instV && instV !== diskWasmVersion) reasons.push(`wasm-drift:${instV}->${diskWasmVersion}`);
-      if (reasons.length > 0) stale.push({ pid, started_ms: startedMs, instance_version: instV, reasons });
-      else fresh.push({ pid, started_ms: startedMs, instance_version: instV });
-    }
-    if (process.platform === 'win32') {
-      const ps = `Get-WmiObject Win32_Process -Filter "name='node.exe' OR name='bun.exe'" | Where-Object { $_.CommandLine -match 'plugkit-wasm-wrapper' } | ForEach-Object { $_.ProcessId.ToString() + '|' + $_.CreationDate }`;
-      const out = cp.execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', ps], { encoding: 'utf-8', windowsHide: true });
-      for (const line of out.split(/\r?\n/).filter(Boolean)) {
-        const [pidStr, creation] = line.split('|');
-        const pid = parseInt(pidStr, 10);
-        if (!Number.isFinite(pid)) continue;
-        const m = creation && creation.match(/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(?:\.(\d+))?(?:([+-])(\d+))?/);
-        if (!m) continue;
-        const localMs = new Date(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], +m[6], m[7] ? Math.round(+('0.' + m[7]) * 1000) : 0).getTime();
-        consider(pid, localMs);
-      }
-    } else {
-      const out = cp.execFileSync('ps', ['-eo', 'pid,lstart,command'], { encoding: 'utf-8' });
-      for (const line of out.split('\n').slice(1)) {
-        if (!line.includes('plugkit-wasm-wrapper')) continue;
-        const m = line.match(/^\s*(\d+)\s+(.+?\d{4})\s+/);
-        if (!m) continue;
-        const pid = parseInt(m[1], 10);
-        const start = Date.parse(m[2]);
-        if (!Number.isFinite(pid) || !Number.isFinite(start)) continue;
-        consider(pid, start);
-      }
-    }
-    const killed = [];
-    const failed = [];
-    for (const s of stale) {
-      try {
-        if (process.platform === 'win32') {
-          cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(s.pid)], { stdio: 'ignore', windowsHide: true });
-        } else {
-          process.kill(s.pid, 'SIGTERM');
-        }
-        killed.push(s.pid);
-      } catch (e) {
-        failed.push({ pid: s.pid, error: e.message });
-      }
-    }
-    console.log(JSON.stringify({
-      ok: true,
-      disk_wrapper_mtime_ms: diskMtime,
-      disk_wasm_version: diskWasmVersion,
-      stale_found: stale.length,
-      fresh_found: fresh.length,
-      stale_detail: stale,
-      killed,
-      failed,
-    }, null, 2));
-    return 0;
-  } catch (e) {
-    console.log(JSON.stringify({ ok: false, error: e.message }));
-    return 1;
-  }
-}
-
 function spoolDir() {
   const projectDir = resolveProjectRoot(process.env.CLAUDE_PROJECT_DIR || process.cwd());
   return path.join(projectDir, '.gm', 'exec-spool');
@@ -230,38 +121,28 @@ function writeCliError(phase, err) {
   } catch (_) {}
 }
 
-// agentplug-runner is the sole native host and a sha256-verified drop-in
-// replacement for this entire bun/node boot path -- when it's installed,
-// delegate to it immediately and exit, before any bun/node bootstrap runs.
-// It serves the identical spool ABI (same in/out layout, same verb names;
-// gm.wasm is one of its loadable plugins alongside libsql/bert/treesitter),
-// so bun/node are only ever exercised as the pure-JS fallback on a platform
-// agentplug-bin has no published binary for, or during the one-time install
-// before the runner lands on disk. (gm-runner, a strictly-inferior
-// single-module duplicate, was retired once agentplug-runner reached full
-// 6-platform parity.)
+// agentplug-runner is the SOLE spool loader -- a native wasmtime binary that
+// loads gm.wasm as one plugin alongside its shared libsql/bert/treesitter
+// plugins and serves the full spool ABI (in/out layout, verb names, browser
+// via direct CDP, task via a native registry). When it is installed, delegate
+// to it immediately and exit before any bun/node bootstrap runs. The JS
+// wasm-host was retired; there is no pure-JS fallback anymore. If no runner is
+// installed, the bootstrap path below downloads the wasm and startSpoolDaemon()
+// either launches the runner or fails loudly with an actionable message
+// (there is no silent no-loader state).
 function tryDelegateToRunner(args) {
   if (process.env.GM_PLUGKIT_NO_RUNNER_DELEGATE === '1') return false;
-  // agentplug-runner is the sole native host now -- gm-runner (a strictly
-  // inferior single-module duplicate) was retired once agentplug-runner had
-  // full 6-platform parity published to agentplug-bin. The JS wasm-host below
-  // is the only fallback, for a platform with no published native binary.
-  const candidates = process.platform === 'win32'
-    ? ['agentplug-runner.exe']
-    : ['agentplug-runner'];
-  for (const exeName of candidates) {
-    const runnerPath = path.join(gmToolsDir(), exeName);
-    if (!fs.existsSync(runnerPath)) continue;
-    try {
-      const result = cp.spawnSync(runnerPath, args, { stdio: 'inherit', windowsHide: true });
-      if (result.error) continue; // this candidate genuinely failed to start -- try the next one
-      process.exit(typeof result.status === 'number' ? result.status : 0);
-    } catch (_) {
-      continue;
-    }
-    return true;
+  const exeName = process.platform === 'win32' ? 'agentplug-runner.exe' : 'agentplug-runner';
+  const runnerPath = path.join(gmToolsDir(), exeName);
+  if (!fs.existsSync(runnerPath)) return false;
+  try {
+    const result = cp.spawnSync(runnerPath, args, { stdio: 'inherit', windowsHide: true });
+    if (result.error) return false; // genuinely failed to start -- fall through to bootstrap+relaunch
+    process.exit(typeof result.status === 'number' ? result.status : 0);
+  } catch (_) {
+    return false;
   }
-  return false;
+  return true;
 }
 
 (async () => {
@@ -274,10 +155,6 @@ function tryDelegateToRunner(args) {
 
   tryDelegateToRunner(args);
 
-  if (args.includes('--kill-stale-watchers')) {
-    process.exit(killStaleWatchers());
-  }
-
   const wantsPinned = process.env.GM_PLUGKIT_PREFER_PINNED === '1' || args.includes('--pinned');
   const alreadyReexecedPinned = process.env.GM_PLUGKIT_PINNED_REEXEC === '1';
   if (wantsPinned && !alreadyReexecedPinned) {
@@ -311,29 +188,16 @@ function tryDelegateToRunner(args) {
     try { ensureGmPlugkitVersionFresh(); } catch (_) {}
     let skillRefresh = null;
     try { skillRefresh = ensureSkillMdFresh(); } catch (_) {}
-    let wrapperRefreshed = false;
-    try { wrapperRefreshed = ensureWrapperFresh(); } catch (_) {}
-    if (wrapperRefreshed) {
-      writeCliStatus({ phase: 'wrapper-drift-detected', reason: 'on-disk-wrapper-refreshed', running_pid: already.pid });
-      console.error(`[gm-plugkit] running watcher (pid=${already.pid}) serves a stale wrapper; on-disk copy just refreshed -- forcing reboot`);
-      try {
-        if (process.platform === 'win32') cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(already.pid)], { stdio: 'ignore', windowsHide: true });
-        else process.kill(already.pid, 'SIGTERM');
-      } catch (_) {}
-      waitForPidDeath(already.pid, 5000);
-    } else {
-      writeCliStatus({ phase: 'ready', already_serving: true, watcher_pid: already.pid });
-      console.log(JSON.stringify({
-        ok: true,
-        already_serving: true,
-        watcher_pid: already.pid,
-        version: already.version,
-        skills_refreshed: skillRefresh && skillRefresh.refreshed || [],
-        wrapper_refreshed: false,
-        message: 'plugkit already serving, no bootstrap/spawn needed',
-      }));
-      process.exit(0);
-    }
+    writeCliStatus({ phase: 'ready', already_serving: true, watcher_pid: already.pid });
+    console.log(JSON.stringify({
+      ok: true,
+      already_serving: true,
+      watcher_pid: already.pid,
+      version: already.version,
+      skills_refreshed: skillRefresh && skillRefresh.refreshed || [],
+      message: 'plugkit already serving, no bootstrap/spawn needed',
+    }));
+    process.exit(0);
   }
   if (versionDrifted) {
     const targetVersion = remoteVersionDrifted ? remoteUpdate.latest : onDiskVersion;
@@ -347,8 +211,7 @@ function tryDelegateToRunner(args) {
     waitForPidDeath(already.pid, 5000);
   }
 
-  const wrapperPath = path.join(gmToolsDir(), 'plugkit-wasm-wrapper.js');
-  if (isReady() && fs.existsSync(wrapperPath)) {
+  if (isReady()) {
     let installedVersion = null;
     try { installedVersion = readVersionFile(); } catch (_) { installedVersion = null; }
     writeCliStatus({ phase: 'bootstrapped', version: installedVersion, binary: getWasmPathSafe() });

package/package.json

@@ -1,17 +1,15 @@
 {
   "name": "gm-plugkit",
-  "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.",
+  "version": "2.0.2026",
+  "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform wasm, verifies SHA256, and launches agentplug-runner (the native wasm host) as the spool watcher daemon.",
   "main": "index.js",
   "bin": {
-    "gm-plugkit": "./cli.js",
-    "plugkit-wasm-wrapper": "./plugkit-wasm-wrapper.js"
+    "gm-plugkit": "./cli.js"
   },
   "files": [
     "cli.js",
     "index.js",
     "bootstrap.js",
-    "plugkit-wasm-wrapper.js",
     "gm-log.js",
     "gm-process.js",
     "plugkit.version",