gm-skill 2.0.1975 → 2.0.1977

package/bin/install.js

@@ -199,6 +199,31 @@ function gmRunnerAssetName() {
   return null;
 }
 
+// Same mapping as gmRunnerAssetName, for agentplug-runner's own CI
+// (AnEntrypoint/agentplug's .github/workflows/release.yml) publishing to
+// AnEntrypoint/agentplug-bin -- must stay byte-identical to that workflow's
+// `artifact:` matrix values.
+function agentplugRunnerAssetName() {
+  const plat = process.platform;
+  const arch = process.arch;
+  if (plat === 'win32') {
+    if (arch === 'x64') return 'agentplug-runner-windows-x64.exe';
+    if (arch === 'arm64') return 'agentplug-runner-windows-arm64.exe';
+    return null;
+  }
+  if (plat === 'darwin') {
+    if (arch === 'x64') return 'agentplug-runner-macos-x64';
+    if (arch === 'arm64') return 'agentplug-runner-macos-arm64';
+    return null;
+  }
+  if (plat === 'linux') {
+    if (arch === 'x64') return 'agentplug-runner-linux-x64';
+    if (arch === 'arm64') return 'agentplug-runner-linux-arm64';
+    return null;
+  }
+  return null;
+}
+
 function httpsGetBuffer(url, redirectsLeft) {
   if (redirectsLeft === undefined) redirectsLeft = 5;
   return new Promise((resolve, reject) => {
@@ -285,6 +310,60 @@ async function downloadGmRunner({ silent } = {}) {
   }
 }
 
+// Downloads agentplug-runner (the generic wasm plugin-host runner gm-runner
+// is migrating to -- hosts gm.wasm plus optional libsql/bert/treesitter
+// plugin wasm modules via a host-mediated plugin_call ABI) from
+// agentplug-bin's GitHub Releases, same sha256-sidecar/atomic-rename trust
+// model as downloadGmRunner. Installed ALONGSIDE gm-runner, not instead of
+// it yet -- cli.js's tryDelegateToRunner prefers agentplug-runner when
+// present (it's the same spool ABI, agentplug-runner is a strict superset),
+// falling back to gm-runner, falling back to bun/npx, so an agentplug-bin
+// download failure (new/unpublished platform, network issue) never
+// regresses an install that already had a working gm-runner.
+async function downloadAgentplugRunner({ silent } = {}) {
+  const assetName = agentplugRunnerAssetName();
+  if (!assetName) {
+    if (!silent) err(`agentplug-runner: no published binary for platform=${process.platform} arch=${process.arch}, skipping`);
+    return false;
+  }
+  const destDir = gmToolsDir();
+  const destPath = path.join(destDir, assetName.endsWith('.exe') ? 'agentplug-runner.exe' : 'agentplug-runner');
+  try {
+    const releaseInfo = JSON.parse((await httpsGetBuffer('https://api.github.com/repos/AnEntrypoint/agentplug-bin/releases/latest')).toString('utf8'));
+    const tag = releaseInfo && releaseInfo.tag_name;
+    if (!tag) { if (!silent) err('agentplug-runner: no releases published yet at AnEntrypoint/agentplug-bin, skipping'); return false; }
+    const base = `https://github.com/AnEntrypoint/agentplug-bin/releases/download/${tag}`;
+    const binUrl = `${base}/${assetName}`;
+    const shaUrl = `${binUrl}.sha256`;
+
+    const versionFile = path.join(destDir, 'agentplug-runner.version');
+    if (fs.existsSync(destPath) && fs.existsSync(versionFile)) {
+      const installed = fs.readFileSync(versionFile, 'utf8').trim();
+      if (installed === tag) { if (!silent) out(`agentplug-runner ${tag} already installed at ${destPath}`); return true; }
+    }
+
+    const [binBuf, shaBuf] = await Promise.all([httpsGetBuffer(binUrl), httpsGetBuffer(shaUrl)]);
+    const expectedSha = shaBuf.toString('utf8').trim().split(/\s+/)[0];
+    const actualSha = sha256Hex(binBuf);
+    if (!expectedSha || actualSha.toLowerCase() !== expectedSha.toLowerCase()) {
+      if (!silent) err(`agentplug-runner: sha256 mismatch downloading ${binUrl} (expected ${expectedSha}, got ${actualSha}), not installing`);
+      return false;
+    }
+
+    fs.mkdirSync(destDir, { recursive: true });
+    const tmp = destPath + '.tmp' + process.pid;
+    fs.writeFileSync(tmp, binBuf);
+    if (process.platform !== 'win32') { try { fs.chmodSync(tmp, 0o755); } catch (_) {} }
+    fs.renameSync(tmp, destPath);
+    fs.writeFileSync(versionFile, tag);
+    if (!silent) out(`Installed agentplug-runner ${tag} to ${destPath}`);
+    return true;
+  } catch (e) {
+    if (!silent) err(`agentplug-runner download skipped: ${e && e.message || e}`);
+    return false;
+  }
+}
+
 function printHelp() {
   out('gm installer');
   out('');
@@ -336,6 +415,7 @@ async function main() {
 
   await runPlugkitBootstrap();
   await downloadGmRunner({ silent: false });
+  await downloadAgentplugRunner({ silent: false });
 
   out('');
   out('Done. Open Claude Code and run /gm. New top-level skill dirs may need one restart to register.');

package/gm-plugkit/cli.js

@@ -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/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1975",
+  "version": "2.0.1977",
   "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/gm-plugkit/plugkit-wasm-wrapper.js

@@ -2573,11 +2573,29 @@ function hostPluginCallViaAgentplugRunner(plugin, verb, body) {
   const bin = resolveAgentplugRunnerBin();
   if (!bin) return null;
   try {
+    // agentplug-runner's `dispatch` one-shot resolves relative paths (e.g.
+    // libsql's "path":"gm.db") against its OWN process cwd -- without an
+    // explicit cwd here it inherits whatever directory spawned the watcher
+    // process itself (which need not be the project root, e.g. a bunx temp
+    // resolution dir), silently opening/creating the wrong gm.db instead of
+    // the real one. Same CLAUDE_PROJECT_DIR-first resolution the rest of
+    // this file already uses for the spool dir.
+    const projectCwd = process.env.CLAUDE_PROJECT_DIR || process.cwd();
+    // 90s, not 30s: `dispatch` now routes through agentplug-runner's shared
+    // daemon when reachable (see agentplug's own daemon.rs) -- a COLD daemon
+    // spawn (no daemon alive yet) plus a plugin that hasn't been downloaded
+    // to this machine yet (first libsql/bert/treesitter call ever) can
+    // genuinely exceed 30s combined, live-witnessed this session as a
+    // real not_implemented_js_wrapper fallback on an otherwise-correct
+    // call. A warm daemon with an already-cached plugin answers in
+    // milliseconds regardless of this ceiling; the higher bound only
+    // matters for the one-time cold path.
     const r = spawnSync(bin, ['dispatch', plugin, verb, body], {
       encoding: 'utf-8',
       windowsHide: true,
-      timeout: 30000,
+      timeout: 90000,
       maxBuffer: 64 * 1024 * 1024,
+      cwd: projectCwd,
     });
     if (r.error || r.status !== 0) return null;
     return r.stdout;

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1975",
+  "version": "2.0.1977",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1975",
+  "version": "2.0.1977",
   "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",