gm-skill 2.0.1824 → 2.0.1825

package/gm-plugkit/bootstrap.js

@@ -774,71 +774,72 @@ function ensureGmPlugkitVersionFresh() {
   } catch (_) { return false; }
 }
 
+const BOOTSTRAP_JS_BUNDLED_SKILLS = ['gm', 'gm-continue', 'wfgy-method'];
+
 function ensureSkillMdFresh() {
-  try {
-    const candidates = [
-      path.join(__dirname, 'SKILL.md'),
-      path.join(__dirname, '..', 'gm-skill', 'skills', 'gm', 'SKILL.md'),
-      path.join(__dirname, '..', '..', 'gm-skill', 'skills', 'gm', 'SKILL.md'),
-      path.join(__dirname, '..', 'skills', 'gm', 'SKILL.md'),
-    ];
-    const bundledPath = candidates.find(p => {
-      try { return fs.existsSync(p); } catch (_) { return false; }
-    });
-    if (!bundledPath) {
-      try {
-        obsEvent('bootstrap', 'skill-md.refresh.bundled-not-found', { searched: candidates });
-      } catch (_) {}
-      return { skipped: 'bundled-not-found' };
-    }
-    const bundled = fs.readFileSync(bundledPath, 'utf-8');
-    const crypto = require('crypto');
-    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.md'),
-      path.join(home, '.claude', 'skills', 'gm', 'SKILL.md'),
-    ];
-    for (const legacy of [
-      path.join(home, '.agents', 'skills', 'gm-skill'),
-      path.join(home, '.claude', 'skills', 'gm-skill'),
-    ]) {
-      try { if (fs.existsSync(legacy)) fs.rmSync(legacy, { recursive: true, force: true }); } catch (_) {}
-    }
-    const refreshed = [];
-    for (const target of targets) {
-      try {
-        let needsWrite = true;
-        if (fs.existsSync(target)) {
-          const existing = fs.readFileSync(target, 'utf-8');
-          const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
-          if (existingHash === bundledHash) needsWrite = false;
-        }
-        if (needsWrite) {
-          fs.mkdirSync(path.dirname(target), { recursive: true });
-          const tmp = target + '.tmp';
-          fs.writeFileSync(tmp, bundled);
-          fs.renameSync(tmp, target);
-          refreshed.push(target);
+  const home = process.env.HOME || process.env.USERPROFILE || require('os').homedir();
+  const crypto = require('crypto');
+  const _norm = s => s.replace(/\r\n/g, '\n');
+  const allRefreshed = [];
+  const sources = {};
+  for (const skillName of BOOTSTRAP_JS_BUNDLED_SKILLS) {
+    try {
+      const candidates = [
+        path.join(__dirname, skillName === 'gm' ? 'SKILL.md' : `SKILL-${skillName}.md`),
+        path.join(__dirname, '..', 'gm-skill', 'skills', skillName, 'SKILL.md'),
+        path.join(__dirname, '..', '..', 'gm-skill', 'skills', skillName, 'SKILL.md'),
+        path.join(__dirname, '..', 'skills', skillName, 'SKILL.md'),
+      ];
+      const bundledPath = candidates.find(p => {
+        try { return fs.existsSync(p); } catch (_) { return false; }
+      });
+      if (!bundledPath) {
+        try { obsEvent('bootstrap', 'skill-md.refresh.bundled-not-found', { skillName, searched: candidates }); } catch (_) {}
+        continue;
+      }
+      const bundled = fs.readFileSync(bundledPath, 'utf-8');
+      const bundledHash = crypto.createHash('sha256').update(_norm(bundled)).digest('hex');
+      const targets = [
+        path.join(home, '.agents', 'skills', skillName, 'SKILL.md'),
+        path.join(home, '.claude', 'skills', skillName, 'SKILL.md'),
+      ];
+      if (skillName === 'gm') {
+        for (const legacy of [
+          path.join(home, '.agents', 'skills', 'gm-skill'),
+          path.join(home, '.claude', 'skills', 'gm-skill'),
+        ]) {
+          try { if (fs.existsSync(legacy)) fs.rmSync(legacy, { recursive: true, force: true }); } catch (_) {}
         }
-      } catch (e) {
+      }
+      sources[skillName] = bundledPath;
+      for (const target of targets) {
         try {
-          obsEvent('bootstrap', 'skill-md.refresh.target-failed', { target, error: e.message });
-        } catch (_) {}
+          let needsWrite = true;
+          if (fs.existsSync(target)) {
+            const existing = fs.readFileSync(target, 'utf-8');
+            const existingHash = crypto.createHash('sha256').update(_norm(existing)).digest('hex');
+            if (existingHash === bundledHash) needsWrite = false;
+          }
+          if (needsWrite) {
+            fs.mkdirSync(path.dirname(target), { recursive: true });
+            const tmp = target + '.tmp';
+            fs.writeFileSync(tmp, bundled);
+            fs.renameSync(tmp, target);
+            allRefreshed.push(target);
+          }
+        } catch (e) {
+          try { obsEvent('bootstrap', 'skill-md.refresh.target-failed', { target, error: e.message }); } catch (_) {}
+        }
       }
+    } catch (e) {
+      try { obsEvent('bootstrap', 'skill-md.refresh.failed', { skillName, error: e.message }); } catch (_) {}
     }
-    if (refreshed.length > 0) {
-      log(`SKILL.md refreshed (sha=${bundledHash.slice(0, 12)}): ${refreshed.length} target(s)`);
-      try {
-        obsEvent('bootstrap', 'skill-md.refreshed', { hash: bundledHash.slice(0, 12), targets: refreshed, source: bundledPath });
-      } catch (_) {}
-    }
-    return { refreshed, bundledHash, source: bundledPath };
-  } catch (e) {
-    try { obsEvent('bootstrap', 'skill-md.refresh.failed', { error: e.message }); } catch (_) {}
-    return { error: e.message };
   }
+  if (allRefreshed.length > 0) {
+    log(`SKILL.md refreshed: ${allRefreshed.length} target(s)`);
+    try { obsEvent('bootstrap', 'skill-md.refreshed', { targets: allRefreshed, sources }); } catch (_) {}
+  }
+  return { refreshed: allRefreshed, sources };
 }
 
 function installedVersionAtTools() {
@@ -1103,6 +1104,7 @@ module.exports = {
   daemonVersionSentinel,
   readVersionFile,
   ensureGmPlugkitVersionFresh,
+  ensureSkillMdFresh,
 };
 
 if (require.main === module) {

package/gm-plugkit/cli.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const cp = require('child_process');
-const { ensureReady, startSpoolDaemon, gmToolsDir, readVersionFile, ensureGmPlugkitVersionFresh } = require('./bootstrap');
+const { ensureReady, startSpoolDaemon, gmToolsDir, readVersionFile, ensureGmPlugkitVersionFresh, ensureSkillMdFresh } = require('./bootstrap');
 
 function readUpdateAvailableMarker(dir) {
   try {
@@ -215,12 +215,15 @@ function writeCliError(phase, err) {
   const versionDrifted = localVersionDrifted || remoteVersionDrifted;
   if (statusServing(already, 12000) && !versionDrifted) {
     try { ensureGmPlugkitVersionFresh(); } catch (_) {}
+    let skillRefresh = null;
+    try { skillRefresh = ensureSkillMdFresh(); } 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 || [],
       message: 'plugkit already serving, no bootstrap/spawn needed',
     }));
     process.exit(0);

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1824",
+  "version": "2.0.1825",
   "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": {
@@ -17,6 +17,8 @@
     "plugkit.version",
     "plugkit.sha256",
     "SKILL.md",
+    "SKILL-gm-continue.md",
+    "SKILL-wfgy-method.md",
     "instructions/"
   ],
   "keywords": [

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1824",
+  "version": "2.0.1825",
   "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.1824",
+  "version": "2.0.1825",
   "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",