promptgraph-mcp 2.9.52 → 2.9.54

package/commands/add-dir.js

@@ -0,0 +1,53 @@
+import { success, error, info } from '../cli.js';
+import chalk from 'chalk';
+import path from 'path';
+import fs from 'fs';
+
+// pg add-dir <path> [--source <name>]
+// Registers an arbitrary local folder as a skill source and indexes it.
+// Fills the gap for users whose skills live outside the default/platform dirs
+// (e.g. opencode users with a custom skills folder that reindex never scanned).
+export default async function handler(args, bin) {
+  const dirArg = args[1];
+  if (!dirArg || dirArg.startsWith('-')) {
+    error('Usage: pg add-dir <path-to-skills-folder> [--source <name>]');
+    process.exit(1);
+  }
+
+  const abs = path.resolve(dirArg);
+  if (!fs.existsSync(abs) || !fs.statSync(abs).isDirectory()) {
+    error(`Not a directory: ${abs}`);
+    process.exit(1);
+  }
+
+  const { globSync } = await import('glob');
+  const mdCount = globSync(`${abs}/**/*.md`, { absolute: true }).length;
+  if (mdCount === 0) {
+    error(`No .md files found under ${abs}`);
+    process.exit(1);
+  }
+
+  const { loadConfig, saveConfig } = await import('../config.js');
+  const config = loadConfig();
+  config.sources = config.sources || [];
+
+  const sourceIdx = args.indexOf('--source');
+  const sourceName = sourceIdx !== -1 && args[sourceIdx + 1]
+    ? `custom:${args[sourceIdx + 1]}`
+    : `custom:${path.basename(abs)}`;
+
+  const existing = config.sources.find(s => path.resolve(s.dir) === abs);
+  if (existing) {
+    info(`Already registered as source "${existing.source}" — re-indexing ${chalk.white.bold(mdCount)} files...`);
+  } else {
+    config.sources.push({ dir: abs, source: sourceName });
+    saveConfig(config);
+    success(`Added source "${sourceName}" → ${abs}`);
+    info(`Indexing ${chalk.white.bold(mdCount)} .md files...`);
+  }
+
+  const { indexSource } = await import('../indexer.js');
+  await indexSource(abs, existing ? existing.source : sourceName);
+  info(chalk.gray('Run `pg reindex` to enable semantic search across all sources.'));
+  process.exit(0);
+}

package/config.js

@@ -4,7 +4,13 @@ import os from 'os';
 
 const HOME = os.homedir();
 const CLAUDE_DIR = path.join(HOME, '.claude');
-export const PROMPTGRAPH_DIR = path.join(CLAUDE_DIR, '.promptgraph');
+
+// Data dir (config/db/index) is platform-neutral at ~/.promptgraph so non-Claude
+// users (opencode/cursor/…) don't get a stray ~/.claude folder. Existing Claude
+// installs keep using ~/.claude/.promptgraph so their index isn't orphaned.
+const LEGACY_PG_DIR = path.join(CLAUDE_DIR, '.promptgraph');
+const NEUTRAL_PG_DIR = path.join(HOME, '.promptgraph');
+export const PROMPTGRAPH_DIR = fs.existsSync(LEGACY_PG_DIR) ? LEGACY_PG_DIR : NEUTRAL_PG_DIR;
 const CONFIG_PATH = path.join(PROMPTGRAPH_DIR, 'config.json');
 
 export const PLATFORM_SKILLS_DIRS = {
@@ -32,17 +38,20 @@ export const RATE_LIMIT_REQUESTS = 30               // requests per window
 export const RATE_LIMIT_WINDOW_MS = 60000           // 1 minute window
 export const BATCH_SIZE = 100                       // batch indexing size
 
-function makeDefaults(skillsDir) {
+function makeDefaults(skillsDir, platform) {
   const base = skillsDir || path.join(CLAUDE_DIR, 'skills-store');
-  return {
-    skillsDir: base,
-    sources: [
-      { dir: base, source: 'skills-store' },
-      { dir: path.join(base, 'marketplace'), source: 'marketplace' },
-      { dir: path.join(CLAUDE_DIR, 'skills'),   source: 'skills' },
-      { dir: path.join(CLAUDE_DIR, 'commands'), source: 'commands' },
-    ],
-  };
+  const sources = [
+    { dir: base, source: 'skills-store' },
+    { dir: path.join(base, 'marketplace'), source: 'marketplace' },
+  ];
+  // Claude-specific dirs (~/.claude/skills, ~/.claude/commands) only on Claude
+  // platforms — otherwise an opencode/cursor user would index (and create) ~/.claude.
+  const isClaude = !platform || platform.startsWith('claude');
+  if (isClaude) {
+    sources.push({ dir: path.join(CLAUDE_DIR, 'skills'),   source: 'skills' });
+    sources.push({ dir: path.join(CLAUDE_DIR, 'commands'), source: 'commands' });
+  }
+  return { skillsDir: base, sources };
 }
 
 
@@ -67,7 +76,7 @@ export async function promptConfig() {
 export function setupForPlatform(platformId) {
   const skillsDir = PLATFORM_SKILLS_DIRS[platformId] || path.join(CLAUDE_DIR, 'skills-store');
   const existing = loadConfig();
-  const config = makeDefaults(skillsDir);
+  const config = makeDefaults(skillsDir, platformId);
   config.platform = platformId;
   // preserve any custom sources the user added
   if (existing.sources) {

package/github-import.js

@@ -205,70 +205,87 @@ export async function validateRepoSkills(ownerRepo) {
 
 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).
+//
+// Uses the recursive git-tree API (1 call) and counts .md files RECURSIVELY under each
+// candidate dir. This handles nested layouts like skills/cloud/*.md or skills/<name>/SKILL.md
+// where a skill dir holds category subfolders rather than .md files directly — the old
+// shallow per-dir listing reported "0 skills" for those and blocked publishing.
 export
 async function detectSkillsDirFromAPI(ownerRepo) {
+  let tree;
   try {
-    const json = await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents`);
-    const entries = JSON.parse(json);
-
-    // 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)) {
-        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 {}
-      }
+    tree = JSON.parse(await httpsGet(`https://api.github.com/repos/${ownerRepo}/git/trees/HEAD?recursive=1`));
+  } catch {
+    return null; // repo not found or inaccessible
+  }
+  if (!tree || !Array.isArray(tree.tree)) return null;
+
+  const blobs = tree.tree.filter(f => f.type === 'blob');
+  if (blobs.length === 0) return null;
+
+  // A path is a valid skill .md if the filename isn't meta (readme/license/…) and no
+  // path segment is a skip dir (docs/tests/assets/…).
+  const isValidMd = (p) => {
+    if (!p.endsWith('.md')) return false;
+    if (SKIP_RE.test(path.basename(p, '.md').toLowerCase())) return false;
+    const segs = p.split('/');
+    for (const seg of segs.slice(0, -1)) if (SKIP_DIRS_API.has(seg.toLowerCase())) return false;
+    return true;
+  };
+  const mdBlobs = blobs.filter(f => isValidMd(f.path));
+  if (mdBlobs.length === 0) return null;
+
+  const countUnder  = (prefix) => mdBlobs.filter(f => f.path.startsWith(prefix)).length;
+  const scriptUnder = (prefix) => blobs.some(f => f.path.startsWith(prefix) && SCRIPT_EXTS_API.has(path.extname(f.path).toLowerCase()));
+
+  // Map of top-level dir names (lowercase -> real casing)
+  const topDirs = new Map();
+  for (const f of blobs) {
+    const idx = f.path.indexOf('/');
+    if (idx > 0) { const d = f.path.slice(0, idx); topDirs.set(d.toLowerCase(), d); }
+  }
+
+  // 1. Known skill dir names (priority order) — counted recursively
+  for (const d of SKILL_DIRS) {
+    if (topDirs.has(d)) {
+      const real = topDirs.get(d);
+      const c = countUnder(`${real}/`);
+      if (c > 0) return { subdir: real, label: real, validMdCount: c, hasScripts: scriptUnder(`${real}/`) };
     }
+  }
 
-    // 1.5 Nested skills dirs (e.g. .claude/skills, .claude-plugin/commands)
-    for (const prefix of ['.claude', '.claude-plugin']) {
-      if (dirMap.has(prefix)) {
-        for (const d of SKILL_DIRS) {
-          const nested = `${prefix}/${d}`;
-          try {
-            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 {}
-        }
+  // 1.5 Nested skill dirs (e.g. .claude/skills, .claude-plugin/commands)
+  for (const prefix of ['.claude', '.claude-plugin']) {
+    if (topDirs.has(prefix)) {
+      const real = topDirs.get(prefix);
+      for (const d of SKILL_DIRS) {
+        const nested = `${real}/${d}`;
+        const c = countUnder(`${nested}/`);
+        if (c > 0) return { subdir: nested, label: nested, validMdCount: c, hasScripts: scriptUnder(`${nested}/`) };
       }
     }
+  }
 
-    // 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, bestScripts = false;
-    for (const dir of subdirCandidates) {
-      try {
-        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, validMdCount: bestCount, hasScripts: bestScripts };
+  // 2. Root-level .md files (skills kept directly at repo root)
+  const rootMd = mdBlobs.filter(f => !f.path.includes('/')).length;
 
-    // 3. Root-level valid .md files
-    const validMdCount = countValidMd(entries);
-    if (validMdCount >= 1) return { subdir: null, label: 'root', validMdCount, hasScripts: hasScriptFiles(entries) };
+  // 3. Best non-skip top-level subdir by recursive .md count
+  let best = null, bestCount = 0;
+  for (const [low, real] of topDirs) {
+    if (SKIP_DIRS_API.has(low)) continue;
+    const c = countUnder(`${real}/`);
+    if (c > bestCount) { bestCount = c; best = real; }
+  }
 
-  } catch {}
-  return null; // repo not found or inaccessible
+  // Prefer root when it holds the skills (and is at least as rich as any subdir)
+  if (rootMd >= 1 && rootMd >= bestCount) {
+    return { subdir: null, label: 'root', validMdCount: rootMd, hasScripts: scriptUnder('') };
+  }
+  if (best) return { subdir: best, label: best, validMdCount: bestCount, hasScripts: scriptUnder(`${best}/`) };
+
+  return null;
 }
 
 // Deep-validate a repo bundle via 1 API call (tree) + raw file fetches (not rate-limited).

package/index.js

@@ -18,7 +18,7 @@ const args = process.argv.slice(2);
 const rawBin = process.argv[1]?.split(/[\\/]/).pop()?.replace(/\.js$/, '');
 const bin = (rawBin && rawBin !== 'index') ? rawBin : 'pg';
 
-const KNOWN_COMMANDS = new Set(['reindex', 'update', 'import', 'install', 'setup', 'validate', 'marketplace', 'doctor', 'search', 'help', '--help', '-h', '--version', '-v', 'version', 'bundle', 'status', 'train']);
+const KNOWN_COMMANDS = new Set(['reindex', 'update', 'import', 'install', 'setup', 'validate', 'marketplace', 'doctor', 'search', 'help', '--help', '-h', '--version', '-v', 'version', 'bundle', 'status', 'train', 'add-dir']);
 
 function showHelp() {
   console.log(
@@ -33,6 +33,7 @@ function showHelp() {
     ['reindex',             'Re-index all skills'],
     ['search <query>',      'Search skills from the terminal'],
     ['import <owner/repo>', 'Import skills from GitHub'],
+    ['add-dir <path>',      'Index skills from a local folder (any platform)'],
     ['status',              'Show installed skills, repos, and bundles'],
     ['install <name>',      'Install a bundle by name, code, or id'],
     ['marketplace',         'Interactive TUI: browse + search + install skills & bundles'],
@@ -93,6 +94,7 @@ const COMMAND_MAP = {
   setup:     './commands/setup.js',
   update:    './commands/update.js',
   reindex:   './commands/reindex.js',
+  'add-dir': './commands/add-dir.js',
 }
 
 if (COMMAND_MAP[args[0]]) {

package/package.json

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