gm-skill 2.0.2086 → 2.0.2087

package/bin/bootstrap.js

@@ -29,6 +29,8 @@ const {
   killSpoolWatcherInCwd,
   proactiveKillForNewInstall,
   ensureNextStepWiring,
+  resolveWindowsExe,
+  resolveNpmCliJs,
 } = shared;
 
 const NPM_PACKAGE = 'plugkit-wasm';
@@ -113,25 +115,6 @@ function ensureSkillMdCurrent(wrapperDir) {
   return { refreshed: allRefreshed };
 }
 
-function resolveWindowsExe(cmd) {
-  if (process.platform !== 'win32') return cmd;
-  try {
-    const r = spawnSync('where', [cmd], {
-      encoding: 'utf-8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      windowsHide: true,
-      timeout: 800,
-    });
-    if (r.status !== 0) return cmd;
-    const lines = (r.stdout || '').split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-    const exe = lines.find(l => /\.exe$/i.test(l));
-    const shim = lines.find(l => /\.(cmd|bat)$/i.test(l));
-    return exe || shim || cmd;
-  } catch {
-    return cmd;
-  }
-}
-
 function probeBinaryVersion(binPath) {
   try {
     const { spawnSync } = require('child_process');
@@ -209,11 +192,14 @@ async function extractNpmPackageWasm(destPath, version) {
     log(`extracting npm package ${NPM_PACKAGE}@${version} to ${tempDir}`);
     obsEvent('bootstrap', 'npm.extract.start', { package: NPM_PACKAGE, version });
 
-    const npxResolved = resolveWindowsExe('npx');
-    const isCmdShim = process.platform === 'win32' && /\.(cmd|bat)$/i.test(npxResolved);
-    const rawArgs = [NPM_PACKAGE + '@' + version, '--prefix', tempDir];
-    const spawnCmd = isCmdShim && /\s/.test(npxResolved) ? `"${npxResolved}"` : npxResolved;
-    const spawnArgs = isCmdShim ? rawArgs.map(a => /[\s"]/.test(a) ? `"${a.replace(/"/g, '\\"')}"` : a) : rawArgs;
+    const npmResolved = resolveWindowsExe('npm');
+    const isCmdShim = process.platform === 'win32' && /\.(cmd|bat)$/i.test(npmResolved);
+    const npmCliJs = isCmdShim ? resolveNpmCliJs(npmResolved) : null;
+    const installArgs = ['install', '--no-audit', '--no-fund', '--no-save', '--prefix', tempDir, NPM_PACKAGE + '@' + version];
+
+    const spawnCmd = npmCliJs ? process.execPath : (isCmdShim && /\s/.test(npmResolved) ? `"${npmResolved}"` : npmResolved);
+    const rawArgs = npmCliJs ? [npmCliJs, ...installArgs] : installArgs;
+    const spawnArgs = (isCmdShim && !npmCliJs) ? rawArgs.map(a => /[\s"]/.test(a) ? `"${a.replace(/"/g, '\\"')}"` : a) : rawArgs;
     const result = spawnSync(
       spawnCmd,
       spawnArgs,
@@ -222,13 +208,13 @@ async function extractNpmPackageWasm(destPath, version) {
         timeout: ATTEMPT_TIMEOUT_MS,
         encoding: 'utf8',
         windowsHide: true,
-        ...(isCmdShim ? { shell: true } : {}),
+        ...((isCmdShim && !npmCliJs) ? { shell: true } : {}),
       }
     );
 
     if (result.error) throw result.error;
     if (result.status !== 0) {
-      throw new Error(`npx extraction failed: ${result.stderr || result.stdout || 'unknown error'}`);
+      throw new Error(`npm install extraction failed: ${result.stderr || result.stdout || 'unknown error'}`);
     }
 
     const nodeModulesPath = path.join(tempDir, 'node_modules', NPM_PACKAGE, 'plugkit.wasm');

package/gm-plugkit/bootstrap.js

@@ -29,27 +29,10 @@ const {
   killSpoolWatcherInCwd,
   proactiveKillForNewInstall,
   ensureNextStepWiring: ensureNextStepWiringShared,
+  resolveWindowsExe,
+  resolveNpmCliJs,
 } = shared;
 
-function resolveWindowsExe(cmd) {
-  if (process.platform !== 'win32') return cmd;
-  try {
-    const r = spawnSync('where', [cmd], {
-      encoding: 'utf-8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      windowsHide: true,
-      timeout: 800,
-    });
-    if (r.status !== 0) return cmd;
-    const lines = (r.stdout || '').split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-    const exe = lines.find(l => /\.exe$/i.test(l));
-    const shim = lines.find(l => /\.(cmd|bat)$/i.test(l));
-    return exe || shim || cmd;
-  } catch {
-    return cmd;
-  }
-}
-
 const NPM_PACKAGE = 'plugkit-wasm';
 const ATTEMPT_TIMEOUT_MS = 10 * 60 * 1000;
 const MAX_ATTEMPTS = 3;
@@ -248,11 +231,13 @@ async function extractNpmPackageWasm(destPath, version) {
     fs.writeFileSync(path.join(tempDir, 'package.json'), JSON.stringify({ name: 'plugkit-extract', version: '0.0.0', private: true }));
 
     const cmd = resolveWindowsExe('npm');
-    const args = ['install', '--no-audit', '--no-fund', '--no-save', NPM_PACKAGE + '@' + version];
+    const installArgs = ['install', '--no-audit', '--no-fund', '--no-save', NPM_PACKAGE + '@' + version];
     const isCmdShim = process.platform === 'win32' && /\.(cmd|bat)$/i.test(cmd);
+    const npmCliJs = isCmdShim ? resolveNpmCliJs(cmd) : null;
 
-    const spawnCmd = isCmdShim ? `"${cmd}"` : cmd;
-    const spawnArgs = isCmdShim ? args.map(a => /[\s"]/.test(a) ? `"${a.replace(/"/g, '\\"')}"` : a) : args;
+    const spawnCmd = npmCliJs ? process.execPath : (isCmdShim ? `"${cmd}"` : cmd);
+    const rawArgs = npmCliJs ? [npmCliJs, ...installArgs] : installArgs;
+    const spawnArgs = (isCmdShim && !npmCliJs) ? rawArgs.map(a => /[\s"]/.test(a) ? `"${a.replace(/"/g, '\\"')}"` : a) : rawArgs;
 
     const result = spawnSync(spawnCmd, spawnArgs, {
       cwd: tempDir,
@@ -260,7 +245,7 @@ async function extractNpmPackageWasm(destPath, version) {
       timeout: ATTEMPT_TIMEOUT_MS,
       encoding: 'utf8',
       windowsHide: true,
-      ...(isCmdShim ? { shell: true } : {}),
+      ...((isCmdShim && !npmCliJs) ? { shell: true } : {}),
     });
 
     if (result.error) throw result.error;

package/gm-plugkit/package.json

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

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.2086",
+  "version": "2.0.2087",
   "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.2086",
+  "version": "2.0.2087",
   "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",