gm-codex 2.0.950 → 2.0.952

package/.codex-plugin/plugin.json

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

package/bin/bootstrap.js

@@ -328,12 +328,14 @@ async function bootstrap(opts) {
   if (fs.existsSync(finalPath) && fs.existsSync(okSentinel)) {
     if (!opts.silent) log(`cache hit: ${finalPath}`);
     pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+    proactiveKillForNewInstall(version, finalPath);
     return finalPath;
   }
 
   if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit')) {
     if (!opts.silent) log(`cache heal (sha match): ${finalPath}`);
     pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+    proactiveKillForNewInstall(version, finalPath);
     try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
     catch (err) { log(`rtk fetch skipped: ${err.message}`); }
     return finalPath;
@@ -344,11 +346,13 @@ async function bootstrap(opts) {
   try {
     if (fs.existsSync(finalPath) && fs.existsSync(okSentinel)) {
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+      proactiveKillForNewInstall(version, finalPath);
       return finalPath;
     }
     if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit')) {
       log(`cache heal (sha match) under lock: ${finalPath}`);
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
+      proactiveKillForNewInstall(version, finalPath);
       try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
       catch (err) { log(`rtk fetch skipped: ${err.message}`); }
       return finalPath;
@@ -393,7 +397,7 @@ async function bootstrap(opts) {
     log(`installed ${finalPath}`);
     obsEvent('bootstrap', 'install.done', { path: finalPath, version, kind: 'plugkit' });
     pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-    proactiveKillForNewInstall(version);
+    proactiveKillForNewInstall(version, finalPath);
     try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
     catch (err) { log(`rtk fetch skipped: ${err.message}`); }
     return finalPath;
@@ -539,6 +543,60 @@ function killRunningDaemons(reason) {
   return killedPids;
 }
 
+function listRunningPlugkitImagePaths() {
+  const out = [];
+  try {
+    const { spawnSync } = require('child_process');
+    if (os.platform() === 'win32') {
+      const r = spawnSync('tasklist', ['/FI', 'IMAGENAME eq plugkit*', '/FO', 'CSV', '/NH'], { windowsHide: true, encoding: 'utf8' });
+      const text = (r && r.stdout) || '';
+      const seen = new Set();
+      for (const line of text.split(/\r?\n/)) {
+        const m = line.match(/^"([^"]+)","(\d+)"/);
+        if (!m) continue;
+        const pid = parseInt(m[2], 10);
+        if (!Number.isFinite(pid) || seen.has(pid)) continue;
+        seen.add(pid);
+        let imagePath = '';
+        try {
+          const p = spawnSync('powershell', ['-NoProfile', '-NonInteractive', '-Command', `(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).Path`], { windowsHide: true, encoding: 'utf8' });
+          imagePath = ((p && p.stdout) || '').trim();
+        } catch (_) {}
+        out.push({ pid, path: imagePath });
+      }
+    } else if (os.platform() === 'linux') {
+      let entries = [];
+      try { entries = fs.readdirSync('/proc'); } catch (_) {}
+      for (const e of entries) {
+        if (!/^\d+$/.test(e)) continue;
+        const pid = parseInt(e, 10);
+        let comm = '';
+        try { comm = fs.readFileSync(`/proc/${pid}/comm`, 'utf8').trim(); } catch (_) { continue; }
+        if (!/^plugkit/i.test(comm)) continue;
+        let imagePath = '';
+        try { imagePath = fs.readlinkSync(`/proc/${pid}/exe`); } catch (_) {}
+        out.push({ pid, path: imagePath });
+      }
+    } else {
+      const r = spawnSync('ps', ['-axo', 'pid=,comm='], { encoding: 'utf8' });
+      const text = (r && r.stdout) || '';
+      for (const line of text.split(/\r?\n/)) {
+        const m = line.match(/^\s*(\d+)\s+(.+?)\s*$/);
+        if (!m) continue;
+        if (!/plugkit/i.test(m[2])) continue;
+        const pid = parseInt(m[1], 10);
+        let imagePath = '';
+        try {
+          const p = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8' });
+          imagePath = ((p && p.stdout) || '').trim().split(/\s+/)[0] || '';
+        } catch (_) {}
+        out.push({ pid, path: imagePath });
+      }
+    }
+  } catch (_) {}
+  return out;
+}
+
 function killSpoolWatcherInCwd(reason) {
   try {
     const pidPath = path.join(process.cwd(), '.gm', 'exec-spool', '.watcher.pid');
@@ -554,19 +612,27 @@ function killSpoolWatcherInCwd(reason) {
   return null;
 }
 
-function proactiveKillForNewInstall(installedVersion) {
+function proactiveKillForNewInstall(installedVersion, finalPath) {
   try {
-    const recorded = readDaemonVersion();
-    if (recorded === installedVersion) return;
-    const reason = `install:${recorded || 'none'}->${installedVersion}`;
-    const killed = killRunningDaemons(reason);
-    const watcherPid = killSpoolWatcherInCwd(reason);
-    if (killed.length || watcherPid) {
-      const parts = [];
-      if (killed.length) parts.push(`daemon pid=${killed.join(',')} v${recorded || '?'}`);
-      if (watcherPid) parts.push(`watcher pid=${watcherPid}`);
-      try { process.stderr.write(`[bootstrap] killed stale ${parts.join(' + ')}, new binary ${installedVersion} ready\n`); } catch (_) {}
+    const reason = `install:v${installedVersion}`;
+    const target = finalPath ? path.resolve(finalPath).toLowerCase() : null;
+    const cacheRootNorm = (() => {
+      try { return path.resolve(cacheRoot()).toLowerCase(); } catch (_) { return null; }
+    })();
+    const procs = listRunningPlugkitImagePaths();
+    for (const { pid, path: imagePath } of procs) {
+      if (!Number.isFinite(pid) || pid === process.pid) continue;
+      if (!imagePath) continue;
+      const norm = path.resolve(imagePath).toLowerCase();
+      if (target && norm === target) continue;
+      if (!cacheRootNorm || !norm.startsWith(cacheRootNorm + path.sep.toLowerCase())) continue;
+      if (killPid(pid)) {
+        try { process.stderr.write(`[bootstrap] killed stale daemon pid=${pid} path=${imagePath} (current install: v${installedVersion})\n`); } catch (_) {}
+        obsEvent('bootstrap', 'daemon.killed', { pid, oldPath: imagePath, installedVersion, mechanism: 'process-path' });
+      }
     }
+    killRunningDaemons(reason);
+    killSpoolWatcherInCwd(reason);
     writeDaemonVersion(installedVersion);
   } catch (_) {}
 }
@@ -576,6 +642,11 @@ function proactiveKillForNewInstall(installedVersion) {
 function killStaleDaemonIfVersionChanged(wrapperDir) {
   let currentVersion;
   try { currentVersion = readVersionFile(wrapperDir); } catch (_) { return; }
+  const cached = resolveCachedBinary({ wrapperDir, version: currentVersion });
+  if (cached) {
+    proactiveKillForNewInstall(currentVersion, cached);
+    return;
+  }
   const recorded = readDaemonVersion();
   if (recorded === currentVersion) return;
   if (recorded) killRunningDaemons(`version_change:${recorded}->${currentVersion}`);

package/bin/plugkit.sha256

@@ -1,6 +1,6 @@
-bbc4d0161be4088b66eea6cc3f7e463a43ab136f42da72d65953a68928fc5995  plugkit-win32-x64.exe
-291dafaab31076f25dd2e2a05a1a58db941465ea48762b7b029e4b309af1d63c  plugkit-win32-arm64.exe
-25cd1a010844e9a3652b9da382088500740b4773c11eea51a871b0d62d436327  plugkit-darwin-x64
-1d38873d0c3cb3317f1b8cab4b12f50631546af4edad3e88fecd870e6d344009  plugkit-darwin-arm64
-d5a94da58384f623aa05da0f77d3dd90d6d65a1d0de0ee718ceae522d9eef458  plugkit-linux-x64
-01d5b0f1f7476ae8dccf13e7fdcc7ec925f27456e76a54e886576d962f433f77  plugkit-linux-arm64
+322a1149762ce77196e12ed43e6cb1b508fe79881ac9b977f5628d306def9d7e  plugkit-win32-x64.exe
+fef4cc7dcac3bb1445dc2db6e7686813f0ff85987149bb5189e5473e9a9de546  plugkit-win32-arm64.exe
+41701f43841581cf47dc608c4470e771889b24658b5997fa3eb66193dcbe1f3f  plugkit-darwin-x64
+7e3e79af802e5aa861f37c6abf367dfd636c22a2868a9ba12a5b2ac718581b5c  plugkit-darwin-arm64
+2578cbfaef623e15f70187a140197c0e9b2cf2126d973c768fe7c23e75c7fd5e  plugkit-linux-x64
+6b0023e89d117bee68d89991c0a931f3d91bc70c5bd1a855c9d2d658eb1d400f  plugkit-linux-arm64

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.322
+0.1.323

package/bin/rtk.sha256

@@ -1,5 +1,5 @@
-15d0b8abcf02d4b5c246370ad63f4948ed38855696e429d752edea1edb819dae  rtk-win32-x64.exe
-9a035ec6e0a49c6986defb7495731785b9adfe3cb4a5d2180231bb418de266c7  rtk-win32-arm64.exe
+25a8fbf7bc1fa573853d24aa55fe210cdbfecbba210ca11c8dcae92eaaf5b4a5  rtk-win32-x64.exe
+9d0fb553b86081532676ed0008186d38a3731a336dd94f9d5804235df6857a5b  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.950",
+  "version": "2.0.952",
   "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.322"
+  "plugkitVersion": "0.1.323"
 }

package/package.json

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