promptgraph-mcp 2.9.46 → 2.9.48

package/commands/bundle.js

@@ -107,14 +107,44 @@ export default async function handler(args, bin) {
       );
       process.exit(1);
     }
-    console.log(chalk.green(`found: ${detected.label}/`));
+    const { validMdCount, hasScripts: hasScriptsQuick } = detected;
+    console.log(chalk.green(`found: ${detected.label}/`) + chalk.gray(` (~${validMdCount} skills by name)`));
+
+    if (validMdCount === 0) {
+      error(`Cannot publish: ${repo}/${detected.label} has no skills that pass validation.\n  All .md files were filtered (README/changelog/docs/etc).`);
+      process.exit(1);
+    }
+
+    // Deep validation: fetch each file via raw (free) + validateSkill on content
+    const { deepValidateRepo: _deepVal } = await import('../github-import.js');
+    process.stdout.write(chalk.gray(`  Validating skill content (${validMdCount} files)... `));
+    let deepResult;
+    try {
+      deepResult = await _deepVal(repo, detected.subdir, (done, total) => {
+        process.stdout.write(`\r  Validating skill content: ${done}/${total}... `);
+      });
+    } catch (e) {
+      process.stdout.write('\n');
+      error(`Validation failed: ${e.message}`); process.exit(1);
+    }
+    process.stdout.write('\n');
+
+    if (deepResult.passed === 0) {
+      error(`Cannot publish: all ${deepResult.total} skill files failed content validation (too short, security patterns, etc).`);
+      process.exit(1);
+    }
+
+    const hasScripts = hasScriptsQuick || deepResult.hasScripts;
+    console.log(chalk.green(`  ✓ ${deepResult.passed}/${deepResult.total} skills valid${hasScripts ? '  🔧 scripts detected' : ''}`));
+
     const name = repo.split('/')[1].replace(/-/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
     const id = repo.replace('/', '-').toLowerCase();
     const bundle = {
       id, name, repo_url: repo, author: repo.split('/')[0],
       description: `Skills from ${repo}`,
       tags: ['community'],
-      stars: 0
+      stars: 0,
+      ...(hasScripts && { has_tools: true }),
     };
     const json = JSON.stringify(bundle, null, 2);
 

package/github-import.js

@@ -197,9 +197,22 @@ export async function validateRepoSkills(ownerRepo) {
   return { ok: errors.length === 0, errors, warnings };
 }
 
+const SCRIPT_EXTS_API = new Set(['.py', '.sh', '.bash', '.js', '.ts', '.rb']);
+
+function countValidMd(fileEntries) {
+  return fileEntries.filter(e =>
+    e.type === 'file' && e.name.endsWith('.md') &&
+    !SKIP_RE.test(e.name.replace(/\.md$/i, '').toLowerCase())
+  ).length;
+}
+
+function hasScriptFiles(fileEntries) {
+  return fileEntries.some(e => e.type === 'file' && SCRIPT_EXTS_API.has(path.extname(e.name).toLowerCase()));
+}
+
 // Ask GitHub API which subdir to use (without cloning anything). Exported for validation.
+// Returns { subdir, label, validMdCount, hasScripts } or null (repo not found / no skills).
 export
-// Returns { subdir, label } or null (use root).
 async function detectSkillsDirFromAPI(ownerRepo) {
   try {
     const json = await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents`);
@@ -208,7 +221,14 @@ async function detectSkillsDirFromAPI(ownerRepo) {
     // 1. Known skill dir names (priority order)
     const dirMap = new Map(entries.filter(e => e.type === 'dir').map(e => [e.name.toLowerCase(), e.name]));
     for (const d of SKILL_DIRS) {
-      if (dirMap.has(d)) return { subdir: dirMap.get(d), label: d };
+      if (dirMap.has(d)) {
+        try {
+          const sub = JSON.parse(await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents/${dirMap.get(d)}`));
+          const validMdCount = countValidMd(sub);
+          if (validMdCount === 0) continue; // dir exists but no valid skills — try next
+          return { subdir: dirMap.get(d), label: d, validMdCount, hasScripts: hasScriptFiles(sub) };
+        } catch {}
+      }
     }
 
     // 1.5 Nested skills dirs (e.g. .claude/skills, .claude-plugin/commands)
@@ -217,35 +237,76 @@ async function detectSkillsDirFromAPI(ownerRepo) {
         for (const d of SKILL_DIRS) {
           const nested = `${prefix}/${d}`;
           try {
-            const sub = await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents/${nested}`);
-            const subEntries = JSON.parse(sub);
-            if (subEntries.length > 0) return { subdir: nested, label: nested };
+            const sub = JSON.parse(await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents/${nested}`));
+            const validMdCount = countValidMd(sub);
+            if (validMdCount > 0) return { subdir: nested, label: nested, validMdCount, hasScripts: hasScriptFiles(sub) };
           } catch {}
         }
       }
     }
 
-    // 2. Any subdir with 2+ .md files — pick the one with most .md files
+    // 2. Any subdir with valid .md files — pick the one with most
     const subdirCandidates = entries.filter(e => e.type === 'dir' && !SKIP_DIRS_API.has(e.name.toLowerCase()));
-    let best = null, bestCount = 0;
+    let best = null, bestCount = 0, bestScripts = false;
     for (const dir of subdirCandidates) {
       try {
-        const sub = await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents/${dir.name}`);
-        const subEntries = JSON.parse(sub);
-        const mdCount = subEntries.filter(e => e.type === 'file' && e.name.endsWith('.md')).length;
-        if (mdCount >= 1 && mdCount > bestCount) { best = dir.name; bestCount = mdCount; }
+        const sub = JSON.parse(await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents/${dir.name}`));
+        const mdCount = countValidMd(sub);
+        if (mdCount > bestCount) { best = dir.name; bestCount = mdCount; bestScripts = hasScriptFiles(sub); }
       } catch {}
     }
-    if (best) return { subdir: best, label: best };
+    if (best) return { subdir: best, label: best, validMdCount: bestCount, hasScripts: bestScripts };
 
-    // 3. Root-level .md files (no subdirectory, skills live at repo root)
-    const rootMd = entries.filter(e => e.type === 'file' && e.name.endsWith('.md') && !SKIP_RE.test(e.name.replace(/\.md$/i, '').toLowerCase()));
-    if (rootMd.length >= 1) return { subdir: null, label: 'root' };
+    // 3. Root-level valid .md files
+    const validMdCount = countValidMd(entries);
+    if (validMdCount >= 1) return { subdir: null, label: 'root', validMdCount, hasScripts: hasScriptFiles(entries) };
 
   } catch {}
   return null; // repo not found or inaccessible
 }
 
+// Deep-validate a repo bundle via 1 API call (tree) + raw file fetches (not rate-limited).
+// Returns { passed, total, hasScripts } — passed = skills that survive validateSkill().
+export async function deepValidateRepo(ownerRepo, subdir, onProgress) {
+  const treeJson = await httpsGet(`https://api.github.com/repos/${ownerRepo}/git/trees/HEAD?recursive=1`);
+  const tree = JSON.parse(treeJson);
+
+  const prefix = subdir ? `${subdir}/` : '';
+  const allBlobs = (tree.tree || []).filter(f => f.type === 'blob');
+
+  const mdFiles = allBlobs.filter(f =>
+    f.path.startsWith(prefix) &&
+    f.path.endsWith('.md') &&
+    !SKIP_RE.test(path.basename(f.path, '.md').toLowerCase())
+  );
+
+  const hasScripts = allBlobs.some(f =>
+    f.path.startsWith(prefix) && SCRIPT_EXTS.has(path.extname(f.path).toLowerCase())
+  );
+
+  const tmpDir = fs.mkdtempSync(path.join(PROMPTGRAPH_DIR, 'pg-val-'));
+  let passed = 0;
+  const total = mdFiles.length;
+
+  try {
+    for (let i = 0; i < mdFiles.length; i++) {
+      const f = mdFiles[i];
+      if (onProgress) onProgress(i + 1, total);
+      try {
+        const rawUrl = `https://raw.githubusercontent.com/${ownerRepo}/HEAD/${f.path}`;
+        const content = await streamDownload(rawUrl);
+        const tmpFile = path.join(tmpDir, `skill-${i}.md`);
+        fs.writeFileSync(tmpFile, content);
+        if (validateSkill(tmpFile).ok) passed++;
+      } catch {}
+    }
+  } finally {
+    try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch {}
+  }
+
+  return { passed, total, hasScripts };
+}
+
 const SKIP_DIRS_API = new Set([
   '.github', 'docs', 'doc', 'documentation', 'examples', 'example',
   'tests', 'test', 'assets', 'images', 'img', 'media', 'static',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptgraph-mcp",
-  "version": "2.9.46",
+  "version": "2.9.48",
   "files": [
     "*.js",
     "commands/",