gm-skill 2.0.1396 → 2.0.1398

package/gm-plugkit/package.json

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

@@ -2287,11 +2287,10 @@ async function runSpoolWatcher(instance, spoolDir) {
           action: 'spawn-replacement-and-exit',
           boot_reason: bootReason,
         });
-        console.error(`[plugkit-wasm] wrapper.js drift detected — spawning replacement via bun x gm-plugkit@latest spool then exiting`);
+        console.error(`[plugkit-wasm] wrapper.js drift detected — spawning replacement directly from installed wrapper then exiting`);
         try {
           const cp = require('child_process');
-          const bunPath = process.env.GM_BUN_PATH || 'bun';
-          const child = cp.spawn(bunPath, ['x', 'gm-plugkit@latest', 'spool'], {
+          const child = cp.spawn(process.execPath, [_wrapperPathInstalled, 'spool'], {
             cwd: process.cwd(),
             detached: true,
             stdio: 'ignore',
@@ -2300,7 +2299,21 @@ async function runSpoolWatcher(instance, spoolDir) {
           });
           child.unref();
         } catch (e) {
-          console.error(`[plugkit-wasm] failed to spawn replacement: ${e.message}`);
+          console.error(`[plugkit-wasm] direct node spawn failed: ${e.message}; falling back to bun x`);
+          try {
+            const cp = require('child_process');
+            const bunPath = process.env.GM_BUN_PATH || 'bun';
+            const child = cp.spawn(bunPath, ['x', 'gm-plugkit@latest', 'spool'], {
+              cwd: process.cwd(),
+              detached: true,
+              stdio: 'ignore',
+              windowsHide: true,
+              env: { ...process.env, PLUGKIT_BOOT_REASON: 'self-respawn-from-wrapper-drift-fallback' },
+            });
+            child.unref();
+          } catch (e2) {
+            console.error(`[plugkit-wasm] fallback bun-x also failed: ${e2.message}`);
+          }
         }
         try { fs.writeFileSync(path.join(spoolDir, '.shutdown-reason.json'), JSON.stringify({ reason: 'wrapper-drift-unsupervised', ts: Date.now(), pid: process.pid, boot_sha: _wrapperShaAtBoot.slice(0, 12), file_sha: cur.slice(0, 12) })); } catch (_) {}
         try { releaseLock(); } catch (_) {}
@@ -2789,6 +2802,30 @@ async function runSpoolWatcher(instance, spoolDir) {
           updateAvailable = { installed: upd.installed, latest: upd.latest };
         }
       } catch (_) {}
+      let deviations30m = 0;
+      try {
+        const day = new Date().toISOString().slice(0, 10);
+        const cutoff = Date.now() - 30 * 60 * 1000;
+        for (const sub of ['hook', 'plugkit']) {
+          const p = path.join(GM_LOG_ROOT, day, `${sub}.jsonl`);
+          if (!fs.existsSync(p)) continue;
+          const raw = fs.readFileSync(p, 'utf-8');
+          let idx = 0;
+          while (true) {
+            const nl = raw.indexOf('\n', idx);
+            const line = nl === -1 ? raw.slice(idx) : raw.slice(idx, nl);
+            if (line.includes('"event":"deviation.')) {
+              const tsm = line.match(/"ts":"([^"]+)"/);
+              if (tsm) {
+                const t = Date.parse(tsm[1]);
+                if (Number.isFinite(t) && t >= cutoff) deviations30m++;
+              }
+            }
+            if (nl === -1) break;
+            idx = nl + 1;
+          }
+        }
+      } catch (_) {}
       fs.writeFileSync(TURN_SUMMARY_PATH, JSON.stringify({
         ts: Date.now(),
         watcher_pid: process.pid,
@@ -2801,6 +2838,7 @@ async function runSpoolWatcher(instance, spoolDir) {
         long_gap_threshold_ms: 300000,
         browser_sessions_alive: browserSessions,
         update_available: updateAvailable,
+        deviations_30m: deviations30m,
       }));
     } catch (_) {}
   }

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1396",
+  "version": "2.0.1398",
   "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.1396",
+  "version": "2.0.1398",
   "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",

package/skills/gm-skill/SKILL.md

@@ -28,7 +28,7 @@ Your first tool call of every session is the boot probe, in one Bash invocation.
 cat .gm/exec-spool/.status.json 2>/dev/null; echo ---; cat .gm/exec-spool/.turn-summary.json 2>/dev/null; echo ---; date +%s%3N
 ```
 
-`.turn-summary.json` carries `phase`, `last_skill`, `prd_pending`, `last_instruction_ts`, `last_instruction_age_ms`, `long_gap_threshold_ms`, `browser_sessions_alive`, `update_available`. When age exceeds the threshold, your next non-orienting verb will be gated — dispatch `instruction` first. When `update_available` is non-null, the watcher has detected drift: kill the watcher and re-bootstrap before continuing so the next instruction lands on the fresh wasm.
+`.turn-summary.json` carries `phase`, `last_skill`, `prd_pending`, `last_instruction_ts`, `last_instruction_age_ms`, `long_gap_threshold_ms`, `browser_sessions_alive`, `update_available`, `deviations_30m`. When age exceeds the threshold, your next non-orienting verb will be gated — dispatch `instruction` first. When `update_available` is non-null, the watcher has detected drift: kill the watcher and re-bootstrap before continuing so the next instruction lands on the fresh wasm. `deviations_30m` is the rolling count of `deviation.*` events from hook+plugkit logs in the past 30 min — read it instead of running gmsniff at session start; non-zero indicates active drift worth investigating before continuing.
 
 Compare `.status.json` `ts` field to the printed epoch ms. If the gap is >15000, the watcher is dead — boot it: