gm-plugkit 2.0.1645 → 2.0.1646

package/bootstrap.js

@@ -460,24 +460,6 @@ function killPid(pid) {
   return true;
 }
 
-function killRunningDaemons(reason) {
-  const tmp = os.tmpdir();
-  const killedPids = [];
-  for (const pidFile of ['glootie-runner.pid', 'plugkit-runner.pid']) {
-    const pidPath = path.join(tmp, pidFile);
-    if (!fs.existsSync(pidPath)) continue;
-    try {
-      const pid = parseInt(fs.readFileSync(pidPath, 'utf8').trim(), 10);
-      if (killPid(pid)) {
-        killedPids.push(pid);
-        obsEvent('bootstrap', 'daemon.killed', { pid, pidFile, reason });
-      }
-      try { fs.unlinkSync(pidPath); } catch (_) {}
-    } catch (_) {}
-  }
-  return killedPids;
-}
-
 function killSpoolWatcherInCwd(reason) {
   try {
     const pidPath = path.join(process.cwd(), '.gm', 'exec-spool', '.watcher.pid');
@@ -525,7 +507,6 @@ function pruneOldVersions(root, keepVersion) {
 function proactiveKillForNewInstall(installedVersion) {
   try {
     const reason = `install:v${installedVersion}`;
-    killRunningDaemons(reason);
     killSpoolWatcherInCwd(reason);
     writeDaemonVersion(installedVersion);
   } catch (_) {}
@@ -541,7 +522,7 @@ function killStaleDaemonIfVersionChanged() {
   }
   const recorded = readDaemonVersion();
   if (recorded === currentVersion) return;
-  if (recorded) killRunningDaemons(`version_change:${recorded}->${currentVersion}`);
+  if (recorded) killSpoolWatcherInCwd(`version_change:${recorded}->${currentVersion}`);
   writeDaemonVersion(currentVersion);
 }
 
@@ -967,7 +948,7 @@ async function ensureReady(opts) {
   }
 
   if (versionDrift) {
-    try { killRunningDaemons(`version_drift:${installed}->${targetVersion}`); } catch (_) {}
+    try { killSpoolWatcherInCwd(`version_drift:${installed}->${targetVersion}`); } catch (_) {}
   }
 
   ensureWrapperFresh();
@@ -1096,7 +1077,6 @@ module.exports = {
   isReady,
   cacheRoot,
   obsEvent,
-  killRunningDaemons,
   killStaleDaemonIfVersionChanged,
   killSpoolWatcherInCwd,
   proactiveKillForNewInstall,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1645",
+  "version": "2.0.1646",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {

package/plugkit-wasm-wrapper.js

@@ -550,9 +550,11 @@ const LEGACY_BROWSER_PORTS_FILE = path.join(TMP_DIR, 'plugkit-browser-ports.json
 const LEGACY_BROWSER_SESSIONS_FILE = path.join(TMP_DIR, 'plugkit-browser-sessions.json');
 
 const __browserRootCache = new Map();
+const BROWSER_ROOT_CACHE_TTL_MS = 60_000;
 function browserRootDir(cwd) {
   const start = path.resolve(cwd || process.cwd());
-  if (__browserRootCache.has(start)) return __browserRootCache.get(start);
+  const cached = __browserRootCache.get(start);
+  if (cached && Date.now() - cached.ts < BROWSER_ROOT_CACHE_TTL_MS) return cached.root;
   let root = start;
   try {
     const r = spawnSync('git', ['rev-parse', '--git-common-dir'], { cwd: start, encoding: 'utf-8', windowsHide: true, timeout: 1500 });
@@ -563,15 +565,18 @@ function browserRootDir(cwd) {
     }
   } catch (_) {}
   root = path.resolve(root);
-  __browserRootCache.set(start, root);
+  __browserRootCache.set(start, { root, ts: Date.now() });
   return root;
 }
 
 function browserStateDir(cwd) {
-  const dir = path.join(browserRootDir(cwd), '.gm', 'exec-spool');
+  const dir = path.join(browserRootDir(cwd), '.gm', 'browser-state');
   try { fs.mkdirSync(dir, { recursive: true }); } catch (_) {}
   return dir;
 }
+function browserStateDirLegacyCoLocated(cwd) {
+  return path.join(browserRootDir(cwd), '.gm', 'exec-spool');
+}
 function browserPortsFile(cwd) { return path.join(browserStateDir(cwd), 'browser-ports.json'); }
 function browserSessionsFile(cwd) { return path.join(browserStateDir(cwd), 'browser-sessions.json'); }
 
@@ -609,14 +614,23 @@ function atomicWriteJson(filePath, obj) {
 function migrateLegacyBrowserState(cwd) {
   const dst1 = browserPortsFile(cwd);
   const dst2 = browserSessionsFile(cwd);
+  const coLocated = browserStateDirLegacyCoLocated(cwd);
+  const coLocatedPorts = path.join(coLocated, 'browser-ports.json');
+  const coLocatedSessions = path.join(coLocated, 'browser-sessions.json');
   try {
-    if (!fs.existsSync(dst1) && fs.existsSync(LEGACY_BROWSER_PORTS_FILE)) {
+    if (!fs.existsSync(dst1) && fs.existsSync(coLocatedPorts)) {
+      const legacy = JSON.parse(fs.readFileSync(coLocatedPorts, 'utf-8'));
+      if (legacy && typeof legacy === 'object') atomicWriteJson(dst1, legacy);
+    } else if (!fs.existsSync(dst1) && fs.existsSync(LEGACY_BROWSER_PORTS_FILE)) {
       const legacy = JSON.parse(fs.readFileSync(LEGACY_BROWSER_PORTS_FILE, 'utf-8'));
       if (legacy && typeof legacy === 'object') atomicWriteJson(dst1, legacy);
     }
   } catch (_) {}
   try {
-    if (!fs.existsSync(dst2) && fs.existsSync(LEGACY_BROWSER_SESSIONS_FILE)) {
+    if (!fs.existsSync(dst2) && fs.existsSync(coLocatedSessions)) {
+      const legacy = JSON.parse(fs.readFileSync(coLocatedSessions, 'utf-8'));
+      if (legacy && typeof legacy === 'object') atomicWriteJson(dst2, legacy);
+    } else if (!fs.existsSync(dst2) && fs.existsSync(LEGACY_BROWSER_SESSIONS_FILE)) {
       const legacy = JSON.parse(fs.readFileSync(LEGACY_BROWSER_SESSIONS_FILE, 'utf-8'));
       if (legacy && typeof legacy === 'object') atomicWriteJson(dst2, legacy);
     }
@@ -2820,8 +2834,10 @@ async function runSpoolWatcher(instance, spoolDir) {
     if (!_ownWrapperSha12) return;
     let reg = {};
     try { reg = JSON.parse(fs.readFileSync(PEER_REGISTRY_PATH, 'utf-8')); } catch (_) { return; }
+    const ownRoot = browserRootDir(process.cwd());
     for (const peerCwd of Object.keys(reg)) {
       if (peerCwd === process.cwd()) continue;
+      if (browserRootDir(peerCwd) !== ownRoot) continue;
       const peerLock = path.join(peerCwd, '.gm', 'exec-spool', '.watcher.lock');
       let content = '';
       try { content = fs.readFileSync(peerLock, 'utf-8').trim(); } catch (_) { continue; }