gm-skill 2.0.1843 → 2.0.1845

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.841
+0.1.842

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-d98719a4fca87818408763e4c52d56f704544f073b2a0477cadd37fd0d9a7e46  plugkit.wasm
+9fa5c0c01535c51918470d2e6f38ac22559a2b001cb2908a08239b8e3c4f63e9  plugkit.wasm

package/gm-plugkit/bootstrap.js

@@ -751,12 +751,31 @@ function ensureWrapperFresh() {
         if (a === b) same = true;
       } catch (_) {}
     }
-    if (!same) {
-      fs.mkdirSync(gmToolsDir(), { recursive: true });
-      fs.copyFileSync(wrapperSrc, wrapperDst);
+    if (same) return false;
+    // Many independent per-project watchers share this one gmToolsDir() install --
+    // concurrent CLI invocations from different projects can race this copy, so
+    // it's lock-guarded (atomic O_EXCL) + tmp-write-then-rename, never a direct
+    // in-place copyFileSync another reader could observe half-written.
+    fs.mkdirSync(gmToolsDir(), { recursive: true });
+    const lockPath = wrapperDst + '.lock';
+    acquireLock(lockPath);
+    try {
+      let stillSame = false;
+      if (fs.existsSync(wrapperDst)) {
+        try {
+          const a = sha256OfFileSync(wrapperSrc);
+          const b = sha256OfFileSync(wrapperDst);
+          if (a === b) stillSame = true;
+        } catch (_) {}
+      }
+      if (stillSame) return false;
+      const tmpDst = wrapperDst + '.tmp.' + process.pid;
+      fs.copyFileSync(wrapperSrc, tmpDst);
+      fs.renameSync(tmpDst, wrapperDst);
       return true;
+    } finally {
+      releaseLock(lockPath);
     }
-    return false;
   } catch (_) { return false; }
 }
 

package/gm-plugkit/cli.js

@@ -219,19 +219,26 @@ function writeCliError(phase, err) {
     try { skillRefresh = ensureSkillMdFresh(); } catch (_) {}
     let wrapperRefreshed = false;
     try { wrapperRefreshed = ensureWrapperFresh(); } catch (_) {}
-    writeCliStatus({ phase: 'ready', already_serving: true, watcher_pid: already.pid });
-    console.log(JSON.stringify({
-      ok: true,
-      already_serving: true,
-      watcher_pid: already.pid,
-      version: already.version,
-      skills_refreshed: skillRefresh && skillRefresh.refreshed || [],
-      wrapper_refreshed: wrapperRefreshed,
-      message: wrapperRefreshed
-        ? 'plugkit already serving; wrapper file on disk was stale and has been refreshed -- restart the watcher to load it'
-        : 'plugkit already serving, no bootstrap/spawn needed',
-    }));
-    process.exit(0);
+    if (wrapperRefreshed) {
+      writeCliStatus({ phase: 'wrapper-drift-detected', reason: 'on-disk-wrapper-refreshed', running_pid: already.pid });
+      console.error(`[gm-plugkit] running watcher (pid=${already.pid}) serves a stale wrapper; on-disk copy just refreshed -- forcing reboot`);
+      try {
+        if (process.platform === 'win32') cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(already.pid)], { stdio: 'ignore', windowsHide: true });
+        else process.kill(already.pid, 'SIGTERM');
+      } catch (_) {}
+    } else {
+      writeCliStatus({ phase: 'ready', already_serving: true, watcher_pid: already.pid });
+      console.log(JSON.stringify({
+        ok: true,
+        already_serving: true,
+        watcher_pid: already.pid,
+        version: already.version,
+        skills_refreshed: skillRefresh && skillRefresh.refreshed || [],
+        wrapper_refreshed: false,
+        message: 'plugkit already serving, no bootstrap/spawn needed',
+      }));
+      process.exit(0);
+    }
   }
   if (versionDrifted) {
     const targetVersion = remoteVersionDrifted ? remoteUpdate.latest : onDiskVersion;

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1843",
+  "version": "2.0.1845",
   "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

@@ -2833,7 +2833,7 @@ function makeHostFunctions(instanceRef) {
           domSelector = domMatch[1];
           evalBody = domMatch[2] && domMatch[2].trim() ? domMatch[2] : 'return null;';
         }
-        const navTimeout = Math.min(timeoutMs, 60000);
+        const navTimeout = Math.min(timeoutMs, 120000);
         const gotoPrefix = startUrl
           ? `await page.goto(${JSON.stringify(startUrl)},{waitUntil:'load',timeout:${navTimeout}});\n`
           : '';

package/gm-plugkit/plugkit.version

@@ -1 +1 @@
-0.1.841
+0.1.842

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1843",
+  "version": "2.0.1845",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -17,5 +17,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "plugkitVersion": "0.1.841"
+  "plugkitVersion": "0.1.842"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1843",
+  "version": "2.0.1845",
   "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",