promptgraph-mcp 2.0.5 → 2.0.7

package/config.js

@@ -1,59 +1,58 @@
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import readline from 'readline';
-
-export const PROMPTGRAPH_DIR = path.join(os.homedir(), '.claude', '.promptgraph');
-export const SKILLS_STORE_DIR = path.join(os.homedir(), '.claude', 'skills-store');
-const CONFIG_PATH = path.join(PROMPTGRAPH_DIR, 'config.json');
-
-const DEFAULTS = {
-  sources: [
-    { dir: path.join(os.homedir(), '.claude', 'skills-store'), source: 'skills-store' },
-    { dir: path.join(os.homedir(), '.claude', 'skills'), source: 'skills' },
-    { dir: path.join(os.homedir(), '.claude', 'commands'), source: 'commands' },
-  ],
-};
-
-export function loadConfig() {
-  if (fs.existsSync(CONFIG_PATH)) {
-    return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
-  }
-  // deep copy to avoid mutating DEFAULTS
-  return JSON.parse(JSON.stringify(DEFAULTS));
-}
-
-export function saveConfig(config) {
-  fs.mkdirSync(path.dirname(CONFIG_PATH), { recursive: true });
-  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
-}
-
-export async function promptConfig() {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const ask = (q) => new Promise(r => rl.question(q, r));
-
-  console.log('\n=== PromptGraph Setup ===\n');
-  console.log('Default skill directories:');
-  DEFAULTS.sources.forEach((s, i) => console.log(`  ${i + 1}. ${s.dir}`));
-
-  const extra = await ask('\nAdd extra skill directories? (comma-separated paths, or press Enter to skip): ');
-  rl.close();
-
-  const config = structuredClone(DEFAULTS);
-
-  if (extra.trim()) {
-    const extraDirs = extra.split(',').map(d => d.trim()).filter(Boolean);
-    for (const dir of extraDirs) {
-      // Use basename so two different dirs named the same still get distinct ids
-      // if basename truly collides, append a short discriminator from the full path
-      const base = path.basename(path.resolve(dir));
-      const existing = config.sources.filter(s => s.source === `custom:${base}`);
-      const tag = existing.length === 0 ? `custom:${base}` : `custom:${base}-${existing.length}`;
-      config.sources.push({ dir, source: tag });
-    }
-  }
-
-  saveConfig(config);
-  console.log(`\nConfig saved to ${CONFIG_PATH}`);
-  return config;
-}
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import readline from 'readline';
+
+const CLAUDE_DIR = path.join(os.homedir(), '.claude');
+export const PROMPTGRAPH_DIR = path.join(CLAUDE_DIR, '.promptgraph');
+export const SKILLS_STORE_DIR = path.join(CLAUDE_DIR, 'skills-store');
+const CONFIG_PATH = path.join(PROMPTGRAPH_DIR, 'config.json');
+
+const DEFAULTS = {
+  sources: [
+    { dir: path.join(CLAUDE_DIR, 'skills-store'), source: 'skills-store' },
+    { dir: path.join(CLAUDE_DIR, 'skills'),    source: 'skills' },
+    { dir: path.join(CLAUDE_DIR, 'commands'),  source: 'commands' },
+  ],
+};
+
+
+export function loadConfig() {
+  if (fs.existsSync(CONFIG_PATH)) {
+    return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
+  }
+  return JSON.parse(JSON.stringify(DEFAULTS));
+}
+
+export function saveConfig(config) {
+  fs.mkdirSync(path.dirname(CONFIG_PATH), { recursive: true });
+  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
+}
+
+export async function promptConfig() {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const ask = (q) => new Promise(r => rl.question(q, r));
+
+  console.log('\n=== PromptGraph Setup ===\n');
+  console.log('Default skill directories:');
+  DEFAULTS.sources.forEach((s, i) => console.log(`  ${i + 1}. ${s.dir}`));
+
+  const extra = await ask('\nAdd extra skill directories? (comma-separated paths, or press Enter to skip): ');
+  rl.close();
+
+  const config = structuredClone(DEFAULTS);
+
+  if (extra.trim()) {
+    const extraDirs = extra.split(',').map(d => d.trim()).filter(Boolean);
+    for (const dir of extraDirs) {
+      const base = path.basename(path.resolve(dir));
+      const existing = config.sources.filter(s => s.source === `custom:${base}`);
+      const tag = existing.length === 0 ? `custom:${base}` : `custom:${base}-${existing.length}`;
+      config.sources.push({ dir, source: tag });
+    }
+  }
+
+  saveConfig(config);
+  console.log(`\nConfig saved to ${CONFIG_PATH}`);
+  return config;
+}

package/index.js

@@ -32,7 +32,8 @@ function showHelp() {
     ['reindex',             'Re-index all skills'],
     ['search <query>',      'Search skills from the terminal'],
     ['import <owner/repo>', 'Import skills from GitHub'],
-    ['marketplace [page]',  'Browse the community skill registry'],
+    ['marketplace [cat]',   'Browse skills by category (Engineering, Coding, …)'],
+    ['marketplace bundles', 'Browse skill bundles grouped by category'],
     ['validate <file.md>',  'Validate a skill before publishing'],
     ['doctor',              'Clean orphaned chunks/edges/ratings'],
     ['update',              'Update to the latest version from npm'],
@@ -104,6 +105,8 @@ if (args[0] === 'marketplace' && (args[1] === 'bundles' || args[1] === 'bundle')
     process.exit(0);
   }
 
+  const CATEGORY_ICONS = { Engineering: '🛠', 'AI Tools': '🤖', Coding: '💻', Creative: '🎨', Security: '🔒', Community: '🌐' };
+
   const wrapB = (t, w, ind) => {
     const words = (t || '').split(/\s+/); const lines = []; let line = '';
     for (const x of words) { if ((line + ' ' + x).trim().length > w) { lines.push(line.trim()); line = x; } else line += ' ' + x; }
@@ -111,18 +114,31 @@ if (args[0] === 'marketplace' && (args[1] === 'bundles' || args[1] === 'bundle')
     return lines.map(l => ind + chalk.gray(l)).join('\n');
   };
 
-  bundles.forEach((b, i) => {
-    const stars = b.stars > 0 ? chalk.yellow('★ ' + b.stars) : chalk.gray('★ 0');
-    const countLabel = b.repo_url
-      ? chalk.blue((b.skillCount ? b.skillCount + ' skills · ' : '') + 'GitHub')
-      : chalk.gray((b.skills?.length || 0) + ' skills');
-    console.log('  ' + chalk.gray((i + 1) + '.') + ' ' + chalk.white.bold(b.id) + '   ' + stars + '   ' + countLabel);
-    console.log(wrapB(b.description, 64, '     '));
-    console.log('     ' + chalk.gray('includes: ') + (b.repo_url ? chalk.blue(b.repo_url) : chalk.gray((b.skills || []).join(', '))));
-    if (b.tags?.length) console.log('     ' + purple(b.tags.map(t => '#' + t).join(' ')));
-    console.log('     ' + chalk.gray('install:  ') + chalk.cyan(`pg bundle install ${b.id}`));
-    console.log();
-  });
+  // Group by category
+  const byCategory = {};
+  for (const b of bundles) {
+    const cat = b.category || 'Community';
+    (byCategory[cat] = byCategory[cat] || []).push(b);
+  }
+
+  let globalIdx = 1;
+  for (const [cat, items] of Object.entries(byCategory)) {
+    const icon = CATEGORY_ICONS[cat] || '📦';
+    console.log('  ' + chalk.hex('#7C3AED').bold(`${icon}  ${cat}`));
+    console.log('  ' + chalk.gray('─'.repeat(50)));
+    for (const b of items) {
+      const stars = b.stars > 0 ? chalk.yellow('★ ' + b.stars) : chalk.gray('★ 0');
+      const countLabel = b.repo_url
+        ? chalk.blue((b.skillCount ? b.skillCount + ' skills · ' : '') + 'GitHub')
+        : chalk.gray((b.skills?.length || 0) + ' skills');
+      console.log('  ' + chalk.gray(globalIdx++ + '.') + ' ' + chalk.white.bold(b.id) + '   ' + stars + '   ' + countLabel);
+      console.log(wrapB(b.description, 64, '     '));
+      console.log('     ' + chalk.gray('includes: ') + (b.repo_url ? chalk.blue(b.repo_url) : chalk.gray((b.skills || []).join(', '))));
+      if (b.tags?.length) console.log('     ' + purple(b.tags.map(t => '#' + t).join(' ')));
+      console.log('     ' + chalk.gray('install:  ') + chalk.cyan(`pg bundle install ${b.id}`));
+      console.log();
+    }
+  }
 
   console.log(
     boxen(
@@ -138,36 +154,35 @@ if (args[0] === 'marketplace' && (args[1] === 'bundles' || args[1] === 'bundle')
 
 if (args[0] === 'marketplace') {
   const { browseMarketplace } = await import('./marketplace.js');
-  const PER_PAGE = 10;
-  const page = Math.max(1, parseInt(args[1]) || 1);
+  const purple = chalk.hex('#7C3AED');
+  const W = 60;
+
+  // Support: pg marketplace <category> or pg marketplace <page>
+  const arg1 = args[1];
+  const pageArg = parseInt(arg1);
+  const categoryFilter = (!arg1 || isNaN(pageArg)) ? (arg1 || null) : null;
+  const PER_PAGE = categoryFilter ? 1000 : 10;
+  const page = categoryFilter ? 1 : Math.max(1, pageArg || 1);
 
   const { clearScreen } = await import('./cli.js');
   const spin = (await import('./cli.js')).spinner('Fetching registry...');
   spin.start();
-  const all = await browseMarketplace(1000);
+  let all = await browseMarketplace(1000);
   spin.stop();
   clearScreen();
 
-  if (all?.error) {
-    error(all.error);
-    process.exit(1);
-  }
+  if (all?.error) { error(all.error); process.exit(1); }
   if (!all.length) {
     info('Registry is empty. Be the first to contribute!');
     console.log(chalk.gray('  github.com/NeiP4n/promptgraph-registry\n'));
     process.exit(0);
   }
 
-  const totalPages = Math.ceil(all.length / PER_PAGE);
-  const startIdx = (page - 1) * PER_PAGE;
-  const slice = all.slice(startIdx, startIdx + PER_PAGE);
-  const purple = chalk.hex('#7C3AED');
-  const W = 60;
+  const SKILL_CAT_ICONS = { Engineering: '🛠', 'AI Tools': '🤖', Coding: '💻', Creative: '🎨', Security: '🔒', Community: '🌐' };
 
   const wrap = (text, width, indent) => {
     const words = (text || '').split(/\s+/);
-    const lines = [];
-    let line = '';
+    const lines = []; let line = '';
     for (const w of words) {
       if ((line + ' ' + w).trim().length > width) { lines.push(line.trim()); line = w; }
       else line += ' ' + w;
@@ -176,46 +191,68 @@ if (args[0] === 'marketplace') {
     return lines.map(l => indent + chalk.dim(l)).join('\n');
   };
 
+  // Filter by category if provided
+  if (categoryFilter) {
+    const matched = categoryFilter.toLowerCase();
+    all = all.filter(s => (s.category || 'community').toLowerCase().includes(matched));
+    if (!all.length) {
+      error(`No skills in category "${categoryFilter}"`);
+      process.exit(1);
+    }
+  }
+
+  // Group by category
+  const byCategory = {};
+  for (const s of all) {
+    const cat = s.category || 'Community';
+    (byCategory[cat] = byCategory[cat] || []).push(s);
+  }
+
   // header
   console.log();
   console.log('  ' + purple.bold('◆ PromptGraph') + chalk.dim('  ·  marketplace'));
-  console.log('  ' + chalk.dim(`${all.length} skills`) + chalk.dim(totalPages > 1 ? `   ·   page ${page}/${totalPages}` : ''));
+  if (categoryFilter) {
+    console.log('  ' + chalk.dim(`${all.length} skills in "${categoryFilter}"`));
+  } else {
+    const cats = Object.keys(byCategory);
+    console.log('  ' + chalk.dim(`${all.length} skills   ·   ${cats.length} categories`));
+  }
   console.log(chalk.dim('  ' + '━'.repeat(W)));
-
-  slice.forEach((s, i) => {
-    const n = chalk.dim(String(startIdx + i + 1).padStart(2));
-    const code = s.code ? chalk.hex('#A78BFA')(s.code) : '';
-    const stars = chalk.yellow('★') + chalk.dim(' ' + (s.stars || 0));
-    console.log();
-    // line 1: number, name ........ code, stars
-    const left = `${n}  ${chalk.bold.white(s.id)}`;
-    console.log('  ' + left + '  ' + code + '   ' + stars);
-    // description
-    console.log(wrap(s.description, W - 6, '      '));
-    // tags
-    if (s.tags?.length) console.log('      ' + chalk.dim(s.tags.map(t => '#' + t).join(' ')));
-  });
-
   console.log();
-  console.log(chalk.dim('  ' + '━'.repeat(W)));
 
-  if (totalPages > 1) {
-    const nav = [];
-    if (page > 1) nav.push(chalk.dim('‹ ') + chalk.cyan(`${bin} marketplace ${page - 1}`));
-    if (page < totalPages) nav.push(chalk.cyan(`${bin} marketplace ${page + 1}`) + chalk.dim(' ›'));
-    console.log('  ' + nav.join('     '));
-    console.log();
+  // Display grouped by category
+  for (const [cat, items] of Object.entries(byCategory)) {
+    const icon = SKILL_CAT_ICONS[cat] || '📦';
+    console.log('  ' + purple.bold(`${icon}  ${cat}`) + chalk.dim(`  (${items.length})`));
+
+    // If not filtering and category has many, paginate within category
+    const showItems = (categoryFilter || items.length <= 5) ? items : items.slice(0, 5);
+    for (const s of showItems) {
+      const code = s.code ? chalk.hex('#A78BFA')(s.code) : '';
+      const stars = chalk.yellow('★') + chalk.dim(' ' + (s.stars || 0));
+      console.log('    ' + chalk.bold.white(s.id) + '   ' + code + '  ' + stars);
+      console.log(wrap(s.description, W - 6, '      '));
+      if (s.tags?.length) console.log('      ' + chalk.dim(s.tags.map(t => '#' + t).join(' ')));
+      console.log('      ' + chalk.dim('install: ') + chalk.cyan(`${bin} install ${s.code || s.id}`));
+      console.log();
+    }
+    if (!categoryFilter && items.length > 5) {
+      console.log('      ' + chalk.dim(`... and ${items.length - 5} more · `) + chalk.cyan(`${bin} marketplace ${cat}`));
+      console.log();
+    }
   }
 
-  const exCode = slice[0]?.code || slice[0]?.id || 'pg-xxxxxx';
+  console.log(chalk.dim('  ' + '━'.repeat(W)));
+  console.log();
+
+  const exCode = all[0]?.code || all[0]?.id || 'pg-xxxxxx';
+  const cats = Object.keys(byCategory).map(c => chalk.cyan(`${bin} marketplace ${c}`)).join('  ');
   console.log(
     boxen(
+      chalk.dim('categories     ') + cats + '\n' +
       chalk.dim('install skill  ') + chalk.white('install ') + chalk.hex('#A78BFA')(exCode) + '\n' +
-      chalk.dim('install bundle ') + chalk.cyan(`pg bundle install <id>`) + '\n' +
-      chalk.dim('add repo       ') + chalk.cyan(`pg bundle add-repo <owner/repo>`) + '\n' +
       chalk.dim('from GitHub    ') + chalk.white('install ') + chalk.hex('#A78BFA')('https://github.com/owner/repo/blob/main/skill.md') + '\n' +
       chalk.dim('publish skill  ') + chalk.white('/pg-publish ') + chalk.hex('#A78BFA')('<file.md>') + '\n' +
-      chalk.dim('publish bundle ') + chalk.white('/pg-publish ') + chalk.hex('#A78BFA')('<bundle.json>') + '\n' +
       chalk.dim('view bundles   ') + chalk.cyan(`${bin} marketplace bundles`),
       { padding: { top: 0, bottom: 0, left: 1, right: 1 }, borderStyle: 'round', borderColor: '#4B5563', dimBorder: true }
     )

package/indexer.js

@@ -11,11 +11,6 @@ import { buildAnnIndex } from './ann.js';
 import { progress, progressDone, success, info, spinner } from './cli.js';
 import chalk from 'chalk';
 
-function fileHash(filePath) {
-  const content = fs.readFileSync(filePath);
-  return createHash('md5').update(content).digest('hex');
-}
-
 async function indexBatch(db, skills) {
   const upsertSkill = db.prepare(`
     INSERT INTO skills (id, name, description, path, source, content, hash)
@@ -132,26 +127,37 @@ export async function indexAll() {
   let skipped = 0;
   let batch = [];
   const start = Date.now();
-  const getHash = db.prepare('SELECT hash FROM skills WHERE id = ?');
+
+  // Build a path→{hash,id} map from DB for O(1) lookups
+  const dbByPath = new Map();
+  for (const row of db.prepare('SELECT id, path, hash FROM skills').all()) {
+    dbByPath.set(row.path, row);
+  }
 
   for (const { file, source } of allFiles) {
     try {
-      if (!isSkillFile(file)) { skipped++; count++; continue; }
-      const hash = fileHash(file);
-      const parsed = parseSkillFile(file, source);
-      const id = skillId(source, parsed.name);
-
-      const existing = getHash.get(id);
-      if (existing?.hash === hash) {
-        skipped++;
-        count++;
-        if (count % 100 === 0) {
-          const eta = count > 0 ? Math.round((total - count) * (Date.now() - start) / count / 1000) : '?';
+      // 1. Read file once
+      let raw;
+      try { raw = fs.readFileSync(file, 'utf8'); } catch { skipped++; count++; continue; }
+
+      // 2. Hash first — cheapest check
+      const hash = createHash('md5').update(raw).digest('hex');
+
+      // 3. If path already in DB with same hash → skip without parsing
+      const dbRow = dbByPath.get(file);
+      if (dbRow?.hash === hash) {
+        skipped++; count++;
+        if (count % 200 === 0) {
+          const eta = Math.round((total - count) * (Date.now() - start) / count / 1000);
           progress(count, total, { skipped, eta, errors });
         }
         continue;
       }
 
+      // 4. Only now check if it's a real skill (content already in memory)
+      if (!isSkillFile(file, raw)) { skipped++; count++; continue; }
+
+      const parsed = parseSkillFile(file, source, { raw });
       batch.push({ ...parsed, hash });
 
       if (batch.length >= BATCH_SIZE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptgraph-mcp",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "main": "index.js",
   "type": "module",
   "bin": {

package/parser.js

@@ -26,21 +26,18 @@ const SKIP_DIRS = new Set([
   'node_modules', 'vendor', 'third_party',
 ]);
 
-export function isSkillFile(filePath) {
+export function isSkillFile(filePath, raw) {
   const parts = filePath.replace(/\\/g, '/').split('/');
   const base = parts[parts.length - 1].replace(/\.md$/i, '').toLowerCase();
 
-  // Skip by filename
   if (SKIP_FILENAMES.has(base)) return false;
 
-  // Skip if any parent directory is in the skip list
   for (const part of parts.slice(0, -1)) {
     if (SKIP_DIRS.has(part.toLowerCase())) return false;
   }
 
-  // Read and check content quality
   try {
-    const raw = fs.readFileSync(filePath, 'utf8');
+    if (!raw) raw = fs.readFileSync(filePath, 'utf8');
 
     // Too short to be a real skill
     if (raw.length < 150) return false;
@@ -67,7 +64,7 @@ export function isSkillFile(filePath) {
 }
 
 export function parseSkillFile(filePath, source, opts = {}) {
-  const raw = fs.readFileSync(filePath, 'utf8');
+  const raw = opts.raw ?? fs.readFileSync(filePath, 'utf8');
 
   let name, description, content;