gm-codex 2.0.962 → 2.0.964

package/.codex-plugin/plugin.json

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

package/bin/bootstrap.js

@@ -24,6 +24,27 @@ function log(msg) {
   try { process.stderr.write(`[plugkit-bootstrap] ${msg}\n`); } catch (_) {}
 }
 
+function probeBinaryVersion(binPath) {
+  try {
+    const { spawnSync } = require('child_process');
+    const r = spawnSync(binPath, ['--version'], { timeout: 3000, encoding: 'utf8' });
+    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; }
+}
+
+function writeBootstrapError(spec) {
+  try {
+    const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
+    const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
+    fs.mkdirSync(spoolDir, { recursive: true });
+    const out = path.join(spoolDir, '.bootstrap-error.json');
+    fs.writeFileSync(out, JSON.stringify({ ts: new Date().toISOString(), ...spec }, null, 2));
+  } catch (_) {}
+}
+
 function obsEvent(subsystem, event, fields) {
   if (process.env.GM_LOG_DISABLE) return;
   try {
@@ -326,19 +347,45 @@ async function bootstrap(opts) {
   const partialPath = `${finalPath}.partial`;
 
   if (fs.existsSync(finalPath) && fs.existsSync(okSentinel)) {
-    if (!opts.silent) log(`cache hit: ${finalPath}`);
-    proactiveKillForNewInstall(version, finalPath);
-    pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-    return finalPath;
+    const actualVersion = probeBinaryVersion(finalPath);
+    if (actualVersion && actualVersion !== version) {
+      log(`cache version mismatch: dir=v${version} contains binary ${actualVersion} → re-fetching v${version}`);
+      writeBootstrapError({
+        expected_version: version,
+        cached_version: actualVersion,
+        error_phase: 'cache-hit-pin-mismatch',
+        error_message: `cached binary at ${finalPath} reports --version=${actualVersion} but cache dir pins v${version}`,
+      });
+      try { fs.unlinkSync(finalPath); } catch (_) {}
+      try { fs.unlinkSync(okSentinel); } catch (_) {}
+    } else {
+      if (!opts.silent) log(`cache hit: ${finalPath}${actualVersion ? ` (matches pin v${version})` : ''}`);
+      proactiveKillForNewInstall(version, finalPath);
+      pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+      return finalPath;
+    }
   }
 
   if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit')) {
-    if (!opts.silent) log(`cache heal (sha match): ${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}`); }
-    return finalPath;
+    const actualVersion = probeBinaryVersion(finalPath);
+    if (actualVersion && actualVersion !== version) {
+      log(`cache heal version mismatch: dir=v${version} contains binary ${actualVersion} → re-fetching`);
+      writeBootstrapError({
+        expected_version: version,
+        cached_version: actualVersion,
+        error_phase: 'cache-heal-pin-mismatch',
+        error_message: `healed binary at ${finalPath} reports --version=${actualVersion} but cache dir pins v${version}`,
+      });
+      try { fs.unlinkSync(finalPath); } catch (_) {}
+      try { fs.unlinkSync(okSentinel); } catch (_) {}
+    } else {
+      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}`); }
+      return finalPath;
+    }
   }
 
   const lockPath = path.join(verDir, '.lock');
@@ -368,12 +415,28 @@ async function bootstrap(opts) {
       } catch (_) {}
     }
     const url = `https://github.com/${RELEASE_REPO}/releases/download/v${version}/${binName}`;
-    await downloadWithRetry(url, partialPath);
+    try {
+      await downloadWithRetry(url, partialPath);
+    } catch (fetchErr) {
+      writeBootstrapError({
+        expected_version: version,
+        cached_version: null,
+        error_phase: 'download',
+        error_message: fetchErr && fetchErr.message ? fetchErr.message : String(fetchErr),
+      });
+      throw fetchErr;
+    }
 
     if (expectedSha) {
       const got = await sha256OfFile(partialPath);
       if (got !== expectedSha) {
         try { fs.unlinkSync(partialPath); } catch (_) {}
+        writeBootstrapError({
+          expected_version: version,
+          cached_version: null,
+          error_phase: 'sha256-mismatch',
+          error_message: `sha256 mismatch for ${binName}: expected ${expectedSha}, got ${got}`,
+        });
         throw new Error(`sha256 mismatch for ${binName}: expected ${expectedSha}, got ${got}`);
       }
       log('sha256 verified');

package/bin/plugkit.sha256

@@ -1,6 +1,6 @@
-ce9ac28e461920fa9b8011e0c9327a939ed652a9710499475499bdf1b4b32b81  plugkit-win32-x64.exe
-90b799fb9c8ea78ee9a332d6ad2ab22171f5223a89993fc28f3e1dd402563999  plugkit-win32-arm64.exe
-19f79c1383cbc759cd4ea9803375183fab2889b4c64035c3a33870d4e2692158  plugkit-darwin-x64
-be166294b66f2300d16237ba354fbaeb4e68fd27448cc2395d0430097d33865c  plugkit-darwin-arm64
-291b990c734789af225032b2f67e03d08013245e246bc7b91b195d4853c7a2e5  plugkit-linux-x64
-0e180fca4e39f1680565d32b0f646ba6f759c21edad112fb887652c7e711b1a3  plugkit-linux-arm64
+3303c0120222b5a50ddadec0e4986025230eae65e31a500ecaba103096de8c29  plugkit-win32-x64.exe
+6ce713b02f976106bccdad27486ddfcc9ba3b2855e9767f56559f49b426e761c  plugkit-win32-arm64.exe
+50861d5cdd9abbfc384ccd2887e306b6614bba545d7ecf2a1aac5cbbf25ccbf6  plugkit-darwin-x64
+4198d955cfcac6f73c83072928b26d28888ba6a727e255702bacb197f5a1672e  plugkit-darwin-arm64
+7a6696c1d025ef4de89dc7ea33e08db8331c7b8719de8d0d354405da6d5b9ff6  plugkit-linux-x64
+6372bd0c10a9058211354196105ba8e835bb57d83c3d2bbc7693d37ea708e9f6  plugkit-linux-arm64

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.325
+0.1.326

package/bin/rtk.sha256

@@ -1,5 +1,5 @@
-7568b81afec0ff8f86d73847b8b43e24a772bdf6f877aae16d86ee15c173f25b  rtk-win32-x64.exe
-eacd700320ef29945bd1269960fdfd5ca1fa82b770612d71a5e089378191f457  rtk-win32-arm64.exe
+663246b9187bc75ca00a8d4b8c9ec7ee6c91db4d8416fa696ba8338f6488d484  rtk-win32-x64.exe
+2c55b8abad5b499cf1914c2b57847f707d0fdb981b1113baddf7ff53b694976d  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.962",
+  "version": "2.0.964",
   "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.325"
+  "plugkitVersion": "0.1.326"
 }

package/package.json

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