npm - gm-plugkit - Versions diffs - 2.0.1974 → 2.0.1976 - Mend

gm-plugkit 2.0.1974 → 2.0.1976

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/cli.js CHANGED Viewed

@@ -248,21 +248,34 @@ function writeCliError(phase, err) {
 // This is the actual code-level enforcement of what was previously only a
 // documented convention (SKILL.md telling an LLM agent to manually prefer
 // gm-runner) -- with this in place bun/node are only ever exercised on a
-// platform gm-runner-bin has no published binary for, or during the
-// one-time install before gm-runner itself lands on disk.
-function tryDelegateToGmRunner(args) {
+// platform neither runner has a published binary for, or during the
+// one-time install before either runner lands on disk.
+//
+// agentplug-runner is tried FIRST, gm-runner second -- agentplug-runner
+// serves the identical spool ABI (same in/out layout, same verb names;
+// gm.wasm is just one of its loadable plugins now) so it's a strict
+// superset, not an alternative; gm-runner stays as the fallback for any
+// install that has it but hasn't picked up agentplug-runner yet (installer
+// re-run pending, or a platform agentplug-bin hasn't published for yet
+// while gm-runner-bin already has).
+function tryDelegateToRunner(args) {
   if (process.env.GM_PLUGKIT_NO_RUNNER_DELEGATE === '1') return false;
-  const exeName = process.platform === 'win32' ? 'gm-runner.exe' : 'gm-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; // exec genuinely failed to start -- fall through to bun/node path
-    process.exit(typeof result.status === 'number' ? result.status : 0);
-  } catch (_) {
-    return false;
+  const candidates = process.platform === 'win32'
+    ? ['agentplug-runner.exe', 'gm-runner.exe']
+    : ['agentplug-runner', 'gm-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;
   }
-  return true;
+  return false;
 }
 (async () => {
@@ -273,7 +286,7 @@ function tryDelegateToGmRunner(args) {
     process.exit(0);
   }
-  tryDelegateToGmRunner(args);
+  tryDelegateToRunner(args);
   if (args.includes('--kill-stale-watchers')) {
     process.exit(killStaleWatchers());

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1974",
+  "version": "2.0.1976",
   "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 CHANGED Viewed

@@ -2548,6 +2548,55 @@ function hostEmbedViaGmRunner(text) {
   }
 }
+let _agentplugRunnerBinPath;
+function resolveAgentplugRunnerBin() {
+  if (_agentplugRunnerBinPath !== undefined) return _agentplugRunnerBinPath;
+  const exe = path.join(GM_TOOLS_ROOT, process.platform === 'win32' ? 'agentplug-runner.exe' : 'agentplug-runner');
+  _agentplugRunnerBinPath = fs.existsSync(exe) ? exe : null;
+  return _agentplugRunnerBinPath;
+}
+// plugkit-core's wasm now imports env:host_plugin_call unconditionally (the
+// agentplug migration routes libsql/bert/treesitter through it instead of
+// linking them in-process) -- WITHOUT this import registered, WebAssembly.
+// instantiate throws a hard LinkError and the wasm never boots at all, not
+// just a degraded-capability fallback like host_vec_embed's absence. This
+// delegates to agentplug-runner's `dispatch <plugin> <verb> <body>` one-shot
+// subcommand (same synchronous spawnSync shape as hostEmbedViaGmRunner
+// above) when a real ~/.gm-tools/agentplug-runner(.exe) is present; when
+// absent, returns a real, typed {"ok":false,"error":"not_implemented_js_wrapper"}
+// envelope instead of a JS-side exception -- lets wasm instantiation and
+// every non-plugin-dependent verb keep working, with only the specific
+// libsql/bert/treesitter-backed verbs (sql_*, recall, memorize, codesearch)
+// failing loud and typed rather than the whole session going dark.
+function hostPluginCallViaAgentplugRunner(plugin, verb, body) {
+  const bin = resolveAgentplugRunnerBin();
+  if (!bin) return null;
+  try {
+    const r = spawnSync(bin, ['dispatch', plugin, verb, body], {
+      encoding: 'utf-8',
+      windowsHide: true,
+      timeout: 30000,
+      maxBuffer: 64 * 1024 * 1024,
+    });
+    if (r.error || r.status !== 0) return null;
+    return r.stdout;
+  } catch (_) {
+    return null;
+  }
+}
+globalThis.__hostPluginCallSync = function __hostPluginCallSync(pluginPtr, pluginLen, verbPtr, verbLen, bodyPtr, bodyLen, instance) {
+  const plugin = readWasmStr(instance, pluginPtr, pluginLen);
+  const verb = readWasmStr(instance, verbPtr, verbLen);
+  const body = readWasmStr(instance, bodyPtr, bodyLen);
+  const result = hostPluginCallViaAgentplugRunner(plugin, verb, body);
+  const out = result != null
+    ? result
+    : JSON.stringify({ ok: false, error: 'not_implemented_js_wrapper', plugin });
+  return writeWasmJson(instance, JSON.parse(out));
+};
 globalThis.__hostEmbedSync = function __hostEmbedSync(textPtr, textLen, outPtr, outLen, instance) {
   try {
     const text = readWasmStr(instance, textPtr, textLen);
@@ -2737,6 +2786,14 @@ function makeHostFunctions(instanceRef) {
       return -1;
     },
+    host_plugin_call: (pluginPtr, pluginLen, verbPtr, verbLen, bodyPtr, bodyLen) => {
+      try {
+        return globalThis.__hostPluginCallSync(pluginPtr, pluginLen, verbPtr, verbLen, bodyPtr, bodyLen, instanceRef.value);
+      } catch (_) {
+        return 0n;
+      }
+    },
     host_vec_search: (qPtr, qLen, k) => {
       try {
         const raw = readWasmStr(instanceRef.value, qPtr, qLen);