gm-skill 2.0.1501 → 2.0.1503

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1501",
+  "version": "2.0.1503",
   "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/gm-plugkit/plugkit-wasm-wrapper.js

@@ -787,11 +787,22 @@ function sleepSync(ms) {
   spawnSync(process.execPath, ['-e', `setTimeout(()=>{}, ${ms})`], { timeout: ms + 2000 });
 }
 
-function runBrowserRunner(pw, args, timeoutMs) {
+function playwriterHomeFor(cwd, claudeSessionId) {
+  if (process.env.PLAYWRITER_HOME) return process.env.PLAYWRITER_HOME;
+  if (!cwd) return path.join(GM_TOOLS_ROOT, `pw-sock-${sessionProfileSlug(claudeSessionId)}`);
+  try { ensureGitignored(cwd, '.gm/pw-sock-*/'); } catch (_) {}
+  return path.join(cwd, '.gm', `pw-sock-${sessionProfileSlug(claudeSessionId)}`);
+}
+
+function runBrowserRunner(pw, args, timeoutMs, cwd, claudeSessionId) {
   const allArgs = [...pw.baseArgs, ...args];
   const useShell = !!pw.shell;
   const spawnCmd = useShell && /\s/.test(pw.cmd) ? `"${pw.cmd}"` : pw.cmd;
   const spawnArgs = useShell ? allArgs.map(a => /[\s"]/.test(String(a)) ? `"${String(a).replace(/"/g, '\\"')}"` : a) : allArgs;
+  const env = { ...process.env };
+  const sockDir = playwriterHomeFor(cwd, claudeSessionId);
+  try { fs.mkdirSync(sockDir, { recursive: true }); } catch (_) {}
+  env.PLAYWRITER_HOME = sockDir;
   // Stamp a busy window before the synchronous spawn so the blocked event loop's stale heartbeat
   // is not misread as a dead watcher. Pad past the spawn timeout for teardown.
   _writeStatusBusy((timeoutMs || 30000) + 5000);
@@ -800,7 +811,7 @@ function runBrowserRunner(pw, args, timeoutMs) {
     timeout: timeoutMs,
     shell: useShell,
     windowsHide: true,
-    env: process.env,
+    env,
   });
 }
 
@@ -2293,7 +2304,30 @@ async function runSpoolWatcher(instance, spoolDir) {
                 child.unref();
                 try { logEvent('plugkit', 'gm-plugkit.self-stale-respawn', { running_version: own, latest_version: latest }); } catch (_) {}
                 try { fs.writeFileSync(path.join(spoolDir, '.shutdown-reason.json'), JSON.stringify({ reason: 'gm-plugkit-self-stale', ts: Date.now(), pid: process.pid, running_version: own, latest_version: latest })); } catch (_) {}
-                setTimeout(() => process.exit(0), 2000);
+                // Wait for the replacement's fresh heartbeat before exiting (mirror the
+                // version-drift path) instead of a blind 2s exit: the gm-plugkit download can
+                // take many seconds, and exiting early lets the supervisor relaunch the SAME
+                // stale version before the new one lands, so the update never sticks.
+                const myPid = process.pid;
+                const respawnDeadline = Date.now() + 90000;
+                const exitSelfStale = () => { try { process.exit(0); } catch (_) {} };
+                const pollSelfStaleReplacement = () => {
+                  try {
+                    const st = JSON.parse(fs.readFileSync(STATUS_PATH_FOR_TEARDOWN, 'utf8'));
+                    const freshHeartbeat = st && st.ts && (Date.now() - st.ts) < 15000;
+                    const differentProc = st && st.pid && st.pid !== myPid;
+                    if (freshHeartbeat && differentProc) {
+                      try { logEvent('plugkit', 'gm-plugkit.self-stale-respawn-confirmed', { old_pid: myPid, new_pid: st.pid, new_version: st.version, latest_version: latest }); } catch (_) {}
+                      return exitSelfStale();
+                    }
+                  } catch (_) {}
+                  if (Date.now() > respawnDeadline) {
+                    try { logEvent('plugkit', 'gm-plugkit.self-stale-respawn-timeout', { old_pid: myPid, waited_ms: 90000 }); } catch (_) {}
+                    return exitSelfStale();
+                  }
+                  setTimeout(pollSelfStaleReplacement, 1500);
+                };
+                setTimeout(pollSelfStaleReplacement, 3000);
               } catch (e) {
                 console.error(`[plugkit-wasm] failed to spawn replacement on self-stale: ${e.message}`);
               }

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1501",
+  "version": "2.0.1503",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1501",
+  "version": "2.0.1503",
   "description": "Canonical universal harness — AI-native software engineering via skill-driven orchestration; bootstraps plugkit for task execution and session isolation. Install in any AI coding agent host.",
   "author": "AnEntrypoint",
   "license": "MIT",