gm-skill 2.0.1544 → 2.0.1546

package/AGENTS.md

@@ -158,11 +158,7 @@ Three npm packages publish from this repo: `gm-skill` (the skill harness), `gm-p
 
 ## Spool-dispatch architecture replaces hooks
 
-Orchestration state is tracked via marker files in `.gm/` instead of hook events. `SpoolDispatcher` reads these markers via `checkDispatchGates(sessionId, operation)` and gates tool use, writes, and git operations:
-
-**Marker files**: `.gm/{prd.yml, mutables.yml, needs-gm, gm-fired-<sessionId>, residual-check-fired}` gate Write/Edit/git via `checkDispatchGates`. Per-marker semantics in rs-learn (`recall: spool dispatch gates marker files`).
-
-**Gate enforcement**: the CLI layer calls `checkDispatchGates()` before tool execution; marker-driven dispatch replaces the hook event pump entirely. Detail in rs-learn (`recall: gate enforcement layer`).
+Orchestration state is tracked via `.gm/` marker files, not hook events; the CLI layer calls `checkDispatchGates()` before tool execution to gate Write/Edit/git. Marker set (`prd.yml, mutables.yml, needs-gm, gm-fired-<sessionId>, residual-check-fired`), per-marker semantics, and the SpoolDispatcher CLI mechanism live in rs-learn (`recall: gate enforcement layer`, `recall: spool dispatch gates marker files`).
 
 **gm-skill tool-use sequencing**: Invoking `Skill(skill="gm-skill")` writes `.gm/gm-fired-<sessionId>` to clear the needs-gm gate. The marker is cleared at turn start to reset the gate. There is one shipped skill; no subagent variant exists.
 

package/bin/bootstrap.js

@@ -27,7 +27,8 @@ function ensureSkillMdCurrent(wrapperDir) {
     const bundledPath = candidates.find(p => { try { return fs.existsSync(p); } catch (_) { return false; } });
     if (!bundledPath) return { skipped: 'bundled-not-found' };
     const bundled = fs.readFileSync(bundledPath, 'utf8');
-    const bundledHash = crypto.createHash('sha256').update(bundled).digest('hex');
+    const _norm = s => s.replace(/\r\n/g, '\n');
+    const bundledHash = crypto.createHash('sha256').update(_norm(bundled)).digest('hex');
     const home = os.homedir();
     const targets = [
       path.join(home, '.agents', 'skills', 'gm-skill', 'SKILL.md'),
@@ -39,7 +40,7 @@ function ensureSkillMdCurrent(wrapperDir) {
         let needsWrite = true;
         if (fs.existsSync(target)) {
           const existing = fs.readFileSync(target, 'utf8');
-          const existingHash = crypto.createHash('sha256').update(existing).digest('hex');
+          const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
           if (existingHash === bundledHash) needsWrite = false;
         }
         if (needsWrite) {

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.641
+0.1.642

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-ae93638360e50b10ccdc581f26c1eeb927465b5896ace833de61cf4e26a3dc1b  plugkit.wasm
+a6532f8efc7b865cc2a4ce2ed714169e7f6110255b01cd709f94a51ca4b70e48  plugkit.wasm

package/gm-plugkit/bootstrap.js

@@ -716,7 +716,8 @@ function ensureSkillMdFresh() {
     }
     const bundled = fs.readFileSync(bundledPath, 'utf-8');
     const crypto = require('crypto');
-    const bundledHash = crypto.createHash('sha256').update(bundled).digest('hex');
+    const _norm = s => s.replace(/\r\n/g, '\n');
+    const bundledHash = crypto.createHash('sha256').update(_norm(bundled)).digest('hex');
     const home = process.env.HOME || process.env.USERPROFILE || require('os').homedir();
     const targets = [
       path.join(home, '.agents', 'skills', 'gm-skill', 'SKILL.md'),
@@ -728,7 +729,7 @@ function ensureSkillMdFresh() {
         let needsWrite = true;
         if (fs.existsSync(target)) {
           const existing = fs.readFileSync(target, 'utf-8');
-          const existingHash = crypto.createHash('sha256').update(existing).digest('hex');
+          const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
           if (existingHash === bundledHash) needsWrite = false;
         }
         if (needsWrite) {

package/gm-plugkit/package.json

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

@@ -2560,6 +2560,17 @@ async function runSpoolWatcher(instance, spoolDir) {
   setTimeout(probeGmPlugkitSelfStale, 5000);
   setInterval(probeGmPlugkitSelfStale, 300_000);
 
+  // A supervised watcher self-exits on drift assuming the supervisor respawns it. If the
+  // supervisor has died, that bare exit leaves the spool dead (worse than staying up). Treat a
+  // dead/absent supervisor as unsupervised so the drift loops take the self-respawn-and-wait path
+  // (spawn replacement, wait for its heartbeat, then exit) instead. False-negative is self-correcting:
+  // if both the supervisor and this watcher respawn, the single-instance lock admits exactly one.
+  function _supervisorIsDead() {
+    try {
+      const sp = parseInt(fs.readFileSync(path.join(spoolDir, '.supervisor.pid'), 'utf8').trim(), 10);
+      return !(Number.isFinite(sp) && isProcessAliveSync(sp));
+    } catch (_) { return true; }
+  }
   const _instanceVersionAtBoot = readInstanceVersion(instance);
   let _driftLoggedOnce = false;
   setInterval(() => {
@@ -2568,7 +2579,7 @@ async function runSpoolWatcher(instance, spoolDir) {
       const instV = _instanceVersionAtBoot;
       if (!fileV || !instV || fileV === instV) return;
       const bootReason = process.env.PLUGKIT_BOOT_REASON || 'unknown';
-      const unsupervised = bootReason === 'direct-no-supervisor';
+      const unsupervised = bootReason === 'direct-no-supervisor' || _supervisorIsDead();
       if (unsupervised) {
         if (_driftLoggedOnce) return;
         _driftLoggedOnce = true;
@@ -2665,7 +2676,7 @@ async function runSpoolWatcher(instance, spoolDir) {
       const cur = crypto.createHash('sha256').update(fs.readFileSync(_wrapperPathInstalled)).digest('hex');
       if (cur === _wrapperShaAtBoot) return;
       const bootReason = process.env.PLUGKIT_BOOT_REASON || 'unknown';
-      const unsupervised = bootReason === 'direct-no-supervisor';
+      const unsupervised = bootReason === 'direct-no-supervisor' || _supervisorIsDead();
       if (unsupervised) {
         if (_wrapperDriftLoggedOnce) return;
         _wrapperDriftLoggedOnce = true;

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1544",
+  "version": "2.0.1546",
   "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.641"
+  "plugkitVersion": "0.1.642"
 }

package/lib/skill-bootstrap.js

@@ -300,7 +300,8 @@ function ensureSkillMdCurrent() {
       return { refreshed: [], skipped: true };
     }
     const bundled = fs.readFileSync(bundledPath, 'utf8');
-    const bundledHash = crypto.createHash('sha256').update(bundled).digest('hex');
+    const _norm = s => s.replace(/\r\n/g, '\n');
+    const bundledHash = crypto.createHash('sha256').update(_norm(bundled)).digest('hex');
     const targets = [
       path.join(os.homedir(), '.agents', 'skills', 'gm-skill', 'SKILL.md'),
       path.join(os.homedir(), '.claude', 'skills', 'gm-skill', 'SKILL.md'),
@@ -311,7 +312,7 @@ function ensureSkillMdCurrent() {
         let needsWrite = true;
         if (fs.existsSync(target)) {
           const existing = fs.readFileSync(target, 'utf8');
-          const existingHash = crypto.createHash('sha256').update(existing).digest('hex');
+          const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
           if (existingHash === bundledHash) needsWrite = false;
         }
         if (needsWrite) {

package/package.json

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

@@ -1,6 +1,6 @@
 ---
 name: gm-skill
-description: Plugkit-served instruction stream. Three-layer admission (cost, bounds, direction) over every possible mutation. Closure on first emit; partial = non-monotonic.
+description: Plugkit-served instruction stream. Three-layer admission (witness, single-writer, direction) over every possible mutation; effort unbounded, never gated on cost. Closure on first emit; partial = non-monotonic.
 allowed-tools: Skill, Read, Write, Bash(bun *), Bash(npx *)
 ---