gm-codex 2.0.966 → 2.0.968

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-codex",
-  "version": "2.0.966",
+  "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/bin/plugkit.sha256

@@ -1,6 +1,6 @@
-1aefc22878c4f939e096ee69813f93c08a18621091c1916a2e31c477ac74b3fc  plugkit-win32-x64.exe
-25fa6301da592722bfde67800a45aaf0ededd205320a30cc74be8ddbe5cd29e9  plugkit-win32-arm64.exe
-46c32f5969063d2513c826578f9f7eb5fe4381881a793273ff8f0be6de91c905  plugkit-darwin-x64
-58c547a1f32774be0cc0166f77f9d585cb0fea3bfc839adf0713c3395ee61cbb  plugkit-darwin-arm64
-9e7d840f3fd173fbbb8a606f7af719ca5f75d1fb8668db6b38d8e5cb0e9a43f4  plugkit-linux-x64
-1b3260df2d3c372499bf2f672f08a6d8321d38d677f2322189406e5795c06e0b  plugkit-linux-arm64
+85d3e85d5d08c18daa09a464d33983c68cd0b27987e4b8e756adc6cc0e75c0a2  plugkit-win32-x64.exe
+1a7f46d9782042b8174fe3b194b7588da6e8e4c6f7e680e5fc1fed21f2ca653d  plugkit-win32-arm64.exe
+29bea04a25c0bb03dc66acf6a157d5fa230e019b1e968a8c133d23ea34e7c03a  plugkit-darwin-x64
+1e66a080f6290967b363a8df7f1c76317788af8fc0a4ce61e343211326079416  plugkit-darwin-arm64
+704f0f3b342ed9dcd3576df32964c21b697c99c2b38f66c3e7ef153ec8711101  plugkit-linux-x64
+f753df6fc9ca77c0935f25fb732fa5b83950c03c2d755528dea5e1727b566434  plugkit-linux-arm64

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.327
+0.1.328

package/bin/rtk.sha256

@@ -1,5 +1,5 @@
-1701c1245d357342834867911f6ccd64bf9a193e290dd5b47a42028460b34f19  rtk-win32-x64.exe
-c2bc67bb0308d2b944004a6c26f4449cda1c572a953fe8a442f475b5a25ec3f6  rtk-win32-arm64.exe
+259d302669a780501f1829d346719bdf751c67b2dbc91b8ebce0cbd55361d039  rtk-win32-x64.exe
+bdfd114d14aab47032bbb9858cc177f154d4c7e5372e798a3d11a3b070ea20fd  rtk-win32-arm64.exe
 1b1e792767ed0e1e6ca0e2f0a8de02e77b06dea2f5ae667278b94baf239fcdc3  rtk-darwin-x64
 9717978d9d6216ea50c94444e00e359479b6315a17bd48c16064b267c8b0b60d  rtk-darwin-arm64
 a100d3defac54194144e5723aec57e6f286b42298c67145c8428815246c9ee56  rtk-linux-x64

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.966",
+  "version": "2.0.968",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -23,5 +23,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "plugkitVersion": "0.1.327"
+  "plugkitVersion": "0.1.328"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-codex",
-  "version": "2.0.966",
+  "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.966",
+  "version": "2.0.968",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",