gm-skill 2.0.1828 → 2.0.1829

package/bin/bootstrap.js

@@ -17,12 +17,26 @@ function log(msg) {
   try { process.stderr.write(`[plugkit-bootstrap] ${msg}\n`); } catch (_) {}
 }
 
-const BOOTSTRAP_BUNDLED_SKILLS = ['gm', 'gm-continue', 'wfgy-method'];
+function discoverBundledSkills(wrapperDir) {
+  const roots = [
+    path.join(wrapperDir, '..', 'skills'),
+    path.join(wrapperDir, '..', '..', 'skills'),
+  ];
+  const root = roots.find(r => { try { return fs.existsSync(r) && fs.statSync(r).isDirectory(); } catch (_) { return false; } });
+  if (!root) return [];
+  try {
+    return fs.readdirSync(root, { withFileTypes: true })
+      .filter(e => e.isDirectory())
+      .map(e => e.name)
+      .filter(name => { try { return fs.existsSync(path.join(root, name, 'SKILL.md')); } catch (_) { return false; } })
+      .sort();
+  } catch (_) { return []; }
+}
 
 function ensureSkillMdCurrent(wrapperDir) {
   const home = os.homedir();
   const allRefreshed = [];
-  for (const skillName of BOOTSTRAP_BUNDLED_SKILLS) {
+  for (const skillName of discoverBundledSkills(wrapperDir)) {
     try {
       const candidates = [
         path.join(wrapperDir, '..', 'skills', skillName, 'SKILL.md'),

package/bin/install.js

@@ -6,11 +6,25 @@ const path = require('path');
 const os = require('os');
 const readline = require('readline');
 
-const BUNDLED_SKILLS = ['gm', 'gm-continue', 'wfgy-method'];
-
 function out(msg) { process.stdout.write(msg + '\n'); }
 function err(msg) { process.stderr.write(msg + '\n'); }
 
+function discoverBundledSkills() {
+  const roots = [
+    path.join(__dirname, '..', 'skills'),
+    path.join(__dirname, '..', '..', 'skills'),
+  ];
+  const root = roots.find(r => { try { return fs.existsSync(r) && fs.statSync(r).isDirectory(); } catch (_) { return false; } });
+  if (!root) return [];
+  try {
+    return fs.readdirSync(root, { withFileTypes: true })
+      .filter(e => e.isDirectory())
+      .map(e => e.name)
+      .filter(name => { try { return fs.existsSync(path.join(root, name, 'SKILL.md')); } catch (_) { return false; } })
+      .sort();
+  } catch (_) { return []; }
+}
+
 function parseArgs(argv) {
   const flags = { yes: false, project: false, help: false };
   for (const a of argv) {
@@ -179,7 +193,7 @@ async function main() {
   const nonInteractive = flags.yes || !process.stdin.isTTY;
 
   let anyInstalled = false;
-  for (const skillName of BUNDLED_SKILLS) {
+  for (const skillName of discoverBundledSkills()) {
     const skillSrc = bundledSkillDir(skillName);
     if (!skillSrc) { err(`bundled skill directory skills/${skillName} not found in package`); continue; }
     const installed = installSkillDir(skillSrc, skillName, home, flags.project);

package/gm-plugkit/bootstrap.js

@@ -774,7 +774,32 @@ function ensureGmPlugkitVersionFresh() {
   } catch (_) { return false; }
 }
 
-const BOOTSTRAP_JS_BUNDLED_SKILLS = ['gm', 'gm-continue', 'wfgy-method'];
+function discoverBundledSkillsAndSources() {
+  const found = new Map();
+  found.set('gm', path.join(__dirname, 'SKILL.md'));
+  try {
+    for (const f of fs.readdirSync(__dirname)) {
+      const m = f.match(/^SKILL-(.+)\.md$/);
+      if (m) found.set(m[1], path.join(__dirname, f));
+    }
+  } catch (_) {}
+  const devSkillsRoots = [
+    path.join(__dirname, '..', 'gm-skill', 'skills'),
+    path.join(__dirname, '..', '..', 'gm-skill', 'skills'),
+    path.join(__dirname, '..', 'skills'),
+  ];
+  for (const root of devSkillsRoots) {
+    try {
+      if (!fs.existsSync(root) || !fs.statSync(root).isDirectory()) continue;
+      for (const e of fs.readdirSync(root, { withFileTypes: true })) {
+        if (!e.isDirectory()) continue;
+        const p = path.join(root, e.name, 'SKILL.md');
+        if (fs.existsSync(p) && !found.has(e.name)) found.set(e.name, p);
+      }
+    } catch (_) {}
+  }
+  return found;
+}
 
 function ensureSkillMdFresh() {
   const home = process.env.HOME || process.env.USERPROFILE || require('os').homedir();
@@ -782,19 +807,11 @@ function ensureSkillMdFresh() {
   const _norm = s => s.replace(/\r\n/g, '\n');
   const allRefreshed = [];
   const sources = {};
-  for (const skillName of BOOTSTRAP_JS_BUNDLED_SKILLS) {
+  const discovered = discoverBundledSkillsAndSources();
+  for (const [skillName, bundledPath] of discovered) {
     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 (_) {}
+      if (!fs.existsSync(bundledPath)) {
+        try { obsEvent('bootstrap', 'skill-md.refresh.bundled-not-found', { skillName, searched: [bundledPath] }); } catch (_) {}
         continue;
       }
       const bundled = fs.readFileSync(bundledPath, 'utf-8');

package/gm-plugkit/package.json

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

package/gm.json

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

package/lib/skill-bootstrap.js

@@ -290,12 +290,26 @@ function ensureBuildToolIgnores(cwd) {
 }
 
 
-const BUNDLED_SKILLS = ['gm', 'gm-continue', 'wfgy-method'];
+function discoverBundledSkills() {
+  const roots = [
+    path.join(__dirname, '..', 'skills'),
+    path.join(__dirname, '..', '..', 'skills'),
+  ];
+  const root = roots.find(r => { try { return fs.existsSync(r) && fs.statSync(r).isDirectory(); } catch (_) { return false; } });
+  if (!root) return [];
+  try {
+    return fs.readdirSync(root, { withFileTypes: true })
+      .filter(e => e.isDirectory())
+      .map(e => e.name)
+      .filter(name => { try { return fs.existsSync(path.join(root, name, 'SKILL.md')); } catch (_) { return false; } })
+      .sort();
+  } catch (_) { return []; }
+}
 
 function ensureSkillMdCurrent() {
   const allRefreshed = [];
   let anySkipped = false;
-  for (const skillName of BUNDLED_SKILLS) {
+  for (const skillName of discoverBundledSkills()) {
     try {
       const bundledPath = resolveFromCandidates([
         path.join(__dirname, '..', 'skills', skillName, 'SKILL.md'),

package/package.json

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