gm-qwen 2.0.972 → 2.0.973

package/bin/bootstrap.js

@@ -345,58 +345,42 @@ async function bootstrap(opts) {
   const partialPath = `${finalPath}.partial`;
 
   if (fs.existsSync(finalPath) && fs.existsSync(okSentinel)) {
-    const actualVersion = probeBinaryVersion(finalPath);
-    if (actualVersion && actualVersion !== version) {
-      log(`cache version mismatch: dir=v${version} contains binary ${actualVersion} → re-fetching v${version}`);
+    if (expectedSha) {
+      const actualSha = sha256OfFileSync(finalPath);
+      if (actualSha === expectedSha) {
+        if (!opts.silent) log(`decision: hit reason: sha-match v${version} (${finalPath})`);
+        return finalPath;
+      }
+      log(`decision: fetch reason: cache-hit-sha-mismatch (dir=v${version} expected ${expectedSha.slice(0,12)}… got ${(actualSha||'').slice(0,12)}…)`);
       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}`,
+        cached_version: null,
+        error_phase: 'cache-hit-sha-mismatch',
+        error_message: `cached binary at ${finalPath} sha=${actualSha} but manifest expects ${expectedSha}`,
       });
       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));
+      if (!opts.silent) log(`decision: hit reason: sentinel+no-sha-manifest (${finalPath})`);
       return finalPath;
     }
   }
 
   if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit')) {
-    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));
-      spawnDetachedRtkFetch(wrapperDir);
-      return finalPath;
-    }
+    if (!opts.silent) log(`decision: heal reason: sha-match (${finalPath})`);
+    spawnDetachedRtkFetch(wrapperDir);
+    return finalPath;
   }
 
   const lockPath = path.join(verDir, '.lock');
   acquireLock(lockPath);
   try {
     if (fs.existsSync(finalPath) && fs.existsSync(okSentinel)) {
-      proactiveKillForNewInstall(version, finalPath);
-      pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+      log(`decision: hit reason: lock-race-resolved (${finalPath})`);
       return finalPath;
     }
     if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit')) {
-      log(`cache heal (sha match) under lock: ${finalPath}`);
-      proactiveKillForNewInstall(version, finalPath);
-      pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+      log(`decision: heal reason: sha-match-under-lock (${finalPath})`);
       spawnDetachedRtkFetch(wrapperDir);
       return finalPath;
     }
@@ -453,7 +437,7 @@ async function bootstrap(opts) {
     }
 
     fs.writeFileSync(okSentinel, new Date().toISOString());
-    log(`installed ${finalPath}`);
+    log(`decision: fetch reason: install-complete (${finalPath})`);
     obsEvent('bootstrap', 'install.done', { path: finalPath, version, kind: 'plugkit' });
     proactiveKillForNewInstall(version, finalPath);
     pruneOldVersions(root, version, readRtkVersion(wrapperDir));

package/gm.json

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

package/package.json

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