gm-codex 2.0.967 → 2.0.968

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-codex",
-  "version": "2.0.967",
+  "version": "2.0.968",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",

package/bin/bootstrap.js

@@ -183,9 +183,7 @@ function acquireLock(lockPath) {
         continue;
       }
       if (Date.now() - start > ATTEMPT_TIMEOUT_MS) throw new Error(`lock wait timeout: ${lockPath}`);
-      const waitMs = 2000;
-      const deadline = Date.now() + waitMs;
-      while (Date.now() < deadline) {}
+      try { const { spawnSync } = require('child_process'); spawnSync(process.execPath, ['-e', 'setTimeout(()=>{}, 2000)'], { timeout: 2500, killSignal: 'SIGKILL' }); } catch (_) {}
     }
   }
 }
@@ -382,8 +380,7 @@ async function bootstrap(opts) {
       if (!opts.silent) log(`cache heal (sha match): ${finalPath}${actualVersion ? ` (matches pin v${version})` : ''}`);
       proactiveKillForNewInstall(version, finalPath);
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-      try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
-      catch (err) { log(`rtk fetch skipped: ${err.message}`); }
+      bootstrapRtk(verDir, version, wrapperDir, opts.silent, root).catch(err => log(`rtk fetch skipped: ${err.message}`));
       return finalPath;
     }
   }
@@ -400,8 +397,7 @@ async function bootstrap(opts) {
       log(`cache heal (sha match) under lock: ${finalPath}`);
       proactiveKillForNewInstall(version, finalPath);
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-      try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
-      catch (err) { log(`rtk fetch skipped: ${err.message}`); }
+      bootstrapRtk(verDir, version, wrapperDir, opts.silent, root).catch(err => log(`rtk fetch skipped: ${err.message}`));
       return finalPath;
     }
 
@@ -654,7 +650,7 @@ function listRunningPlugkitImagePaths() {
         out.push({ pid, path: imagePath });
       }
     } else {
-      const r = spawnSync('ps', ['-axo', 'pid=,comm='], { encoding: 'utf8' });
+      const r = spawnSync('ps', ['-axo', 'pid=,comm='], { encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL' });
       const text = (r && r.stdout) || '';
       for (const line of text.split(/\r?\n/)) {
         const m = line.match(/^\s*(\d+)\s+(.+?)\s*$/);
@@ -663,7 +659,7 @@ function listRunningPlugkitImagePaths() {
         const pid = parseInt(m[1], 10);
         let imagePath = '';
         try {
-          const p = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8' });
+          const p = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8', timeout: 3000, killSignal: 'SIGKILL' });
           imagePath = ((p && p.stdout) || '').trim().split(/\s+/)[0] || '';
         } catch (_) {}
         out.push({ pid, path: imagePath });

package/bin/plugkit.js

@@ -7,6 +7,30 @@ const { bootstrap, resolveCachedBinary, resolveCachedRtk, obsEvent, killStaleDae
 
 const dir = __dirname;
 
+function readPinnedVersion() {
+  try { return fs.readFileSync(path.join(dir, 'plugkit.version'), 'utf8').trim(); } catch (_) { return null; }
+}
+
+function probeCachedVersion(binPath) {
+  try {
+    const r = spawnSync(binPath, ['--version'], { timeout: 3000, encoding: 'utf8', windowsHide: true });
+    if (r.error) return null;
+    const text = `${r.stdout || ''} ${r.stderr || ''}`.trim();
+    const m = text.match(/(\d+\.\d+\.\d+)/);
+    return m ? m[1] : null;
+  } catch (_) { return null; }
+}
+
+async function resolveBinaryWithPinCheck() {
+  const cached = resolveCachedBinary({ wrapperDir: dir });
+  if (!cached) return null;
+  const pin = readPinnedVersion();
+  if (!pin) return cached;
+  const got = probeCachedVersion(cached);
+  if (got && got === pin) return cached;
+  try { return await bootstrap({ wrapperDir: dir, silent: true }); } catch (_) { return cached; }
+}
+
 function envWithRtkOnPath() {
   const rtkPath = resolveCachedRtk({ wrapperDir: dir });
   if (!rtkPath) return process.env;
@@ -49,7 +73,7 @@ async function main() {
       // below — fall through to the spawn path so the actual handler runs.
       if (!bin) process.exit(0);
     } else if (isHook) {
-      bin = resolveCachedBinary({ wrapperDir: dir }) || legacyFallback();
+      bin = (await resolveBinaryWithPinCheck()) || legacyFallback();
       if (!bin) {
         process.stderr.write(`[plugkit] hook ${hookSubcmd} skipped: binary not yet installed. Bootstrap will run on session-start.\n`);
         obsEvent('plugkit_wrapper', 'hook_skip_uncached', { argv: args.slice(0, 4), dur_ms: Date.now() - startedAt });

package/gm.json

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

package/package.json

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

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.967",
+  "version": "2.0.968",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",