gm-oc 2.0.286 → 2.0.289

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-oc",
-  "version": "2.0.286",
+  "version": "2.0.289",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/scripts/bootstrap.js

@@ -3,60 +3,66 @@
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
+const { execFileSync } = require('child_process');
 
 const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
 if (!pluginRoot) process.exit(0);
 
 const IS_WIN = process.platform === 'win32';
-const binPath = path.join(pluginRoot, 'bin', IS_WIN ? 'plugkit.exe' : 'plugkit');
+const binDir = path.join(pluginRoot, 'bin');
+const binPath = path.join(binDir, IS_WIN ? 'plugkit.exe' : 'plugkit');
 const pendingPath = binPath + '.pending';
+const versionFile = path.join(binDir, '.plugkit-version');
+const pendingVersionFile = pendingPath + '.version';
 
 function getAssetName() {
-  const platform = process.platform;
-  const arch = process.arch;
-  const os = platform === 'win32' ? 'win32' : platform === 'darwin' ? 'darwin' : 'linux';
-  const cpu = arch === 'arm64' ? 'arm64' : 'x64';
-  const ext = platform === 'win32' ? '.exe' : '';
+  const os = process.platform === 'win32' ? 'win32' : process.platform === 'darwin' ? 'darwin' : 'linux';
+  const cpu = process.arch === 'arm64' ? 'arm64' : 'x64';
+  const ext = process.platform === 'win32' ? '.exe' : '';
   return `plugkit-${os}-${cpu}${ext}`;
 }
 
+function killDaemon() {
+  try {
+    execFileSync(binPath, ['runner', 'stop'], { timeout: 5000, stdio: 'ignore' });
+  } catch {}
+  if (IS_WIN) {
+    try { execFileSync('taskkill', ['/F', '/IM', 'plugkit.exe'], { timeout: 3000, stdio: 'ignore' }); } catch {}
+  }
+}
+
 function applyPending() {
   if (!fs.existsSync(pendingPath)) return;
+  killDaemon();
   try {
     if (fs.existsSync(binPath)) fs.unlinkSync(binPath);
     fs.renameSync(pendingPath, binPath);
+    if (fs.existsSync(pendingVersionFile)) {
+      try { fs.renameSync(pendingVersionFile, versionFile); } catch {}
+    }
   } catch {}
 }
 
 applyPending();
 
-function getVersion() {
+function getRequiredVersion() {
   try {
     return JSON.parse(fs.readFileSync(path.join(pluginRoot, 'gm.json'), 'utf8')).plugkitVersion || null;
   } catch { return null; }
 }
 
 function getCurrentVersion() {
-  if (!fs.existsSync(binPath)) return null;
-  try {
-    const { execFileSync } = require('child_process');
-    const out = execFileSync(binPath, ['--version'], { timeout: 5000 }).toString().trim();
-    const m = out.match(/(\d+\.\d+\.\d+)/);
-    return m ? m[1] : null;
-  } catch { return null; }
+  try { return fs.readFileSync(versionFile, 'utf8').trim() || null; } catch { return null; }
 }
 
-const required = getVersion();
+const required = getRequiredVersion();
 const current = getCurrentVersion();
 if (current && current === required) process.exit(0);
 
 function download(version, dest, cb) {
   const asset = getAssetName();
-  const urlPath = version
-    ? `/AnEntrypoint/rs-plugkit/releases/download/v${version}/${asset}`
-    : `/AnEntrypoint/rs-plugkit/releases/latest/download/${asset}`;
-  const destDir = path.dirname(dest);
-  if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
+  const urlPath = `/AnEntrypoint/rs-plugkit/releases/download/v${version}/${asset}`;
+  if (!fs.existsSync(path.dirname(dest))) fs.mkdirSync(path.dirname(dest), { recursive: true });
   const follow = (url) => {
     const mod = url.startsWith('https') ? https : require('http');
     const opts = { ...require('url').parse(url), headers: { 'User-Agent': 'gm-bootstrap' } };
@@ -65,19 +71,28 @@ function download(version, dest, cb) {
       if (res.statusCode !== 200) return cb(new Error(`HTTP ${res.statusCode}`));
       const chunks = [];
       res.on('data', c => chunks.push(c));
-      res.on('end', () => { try { fs.writeFileSync(dest, Buffer.concat(chunks)); try { fs.chmodSync(dest, 0o755); } catch {} cb(null); } catch (e) { cb(e); } });
+      res.on('end', () => {
+        try {
+          fs.writeFileSync(dest, Buffer.concat(chunks));
+          try { fs.chmodSync(dest, 0o755); } catch {}
+          cb(null);
+        } catch (e) { cb(e); }
+      });
     }).on('error', cb);
   };
   follow(`https://github.com${urlPath}`);
 }
 
+killDaemon();
+
 download(required, binPath, (err) => {
-  if (err && err.message.includes('EBUSY')) {
+  if (err && err.code === 'EBUSY') {
     download(required, pendingPath, (err2) => {
       if (err2) {
-        process.stderr.write(`bootstrap: ${err2.message}\n`);
+        process.stderr.write(`bootstrap: pending failed: ${err2.message}\n`);
         process.exit(fs.existsSync(binPath) ? 0 : 1);
       }
+      try { fs.writeFileSync(pendingVersionFile, required); } catch {}
       process.exit(0);
     });
     return;
@@ -86,5 +101,6 @@ download(required, binPath, (err) => {
     process.stderr.write(`bootstrap: ${err.message}\n`);
     process.exit(fs.existsSync(binPath) ? 0 : 1);
   }
+  try { fs.writeFileSync(versionFile, required); } catch {}
   process.exit(0);
 });